Added game objects
Merge branch 'master' of https://github.com/qazeh/haptopong

Conflicts:
	haptopong/GfxScene.h