Attempt to resolve merge conflicts

Conflicts:
	code/Assets/Scenes/MainScene.unity
Merge branch 'master' of https://github.com/depstein/ggj-2014