Merge branch 'master' of https://github.com/LostBalloon1/ggj13

Conflicts:
	TheGame/Assets/Scenes/Ioan Test.unity
iyk
Merge branch 'master' of https://github.com/LostBalloon1/ggj13