few changes
Merge branch 'master' of https://github.com/soulkyiro/LudumDare

Conflicts:
	Assets/Scripts/Controller/LevelController.cs