Merge branch 'master' of https://bitbucket.org/Hadryel/ggj2017

# Conflicts:
#	Assets/Sprites/coin.png.meta
