c
Merge branch 'master' of https://github.com/holybomb/CrystalGame

Conflicts:
	Classes/HelloWorldScene.cpp