Test Commit on Mac OSX
Merge branch 'master' of https://github.com/crebstar/UI_ON_SPEED

Conflicts:
	Classes/HelloWorldScene.cpp
Resolving Conflicts