Tutorial work
Merge branch 'master' of https://github.com/jacksonGross/UniLife

Conflicts:
	Classes/Controllers/TutorialController.cpp
	Classes/Controllers/TutorialController.h
	Classes/Scenes/TutorialScene.cpp