update
Merge branch 'master' of https://github.com/swmaestro/Hackathon

Conflicts:
	Hackathon.xcodeproj/project.pbxproj
	Hackathon/Classes/MainScene.cpp