intermediate
Merge branch 'master' of https://github.com/ltearain/gravityboard

Conflicts:
	Classes/GameMgr.h