Start level
Merge branch 'develop' of https://github.com/ggj/ggj13 into develop
Change level
Merge branch 'develop' of https://github.com/ggj/ggj13 into develop

Conflicts:
	source/game/GameScene.cpp
	source/game/GameScene.h