test
solve conflicts

Conflicts:
	Classes/GameScene.cpp
	Classes/GameScene.h