confrict fix

confrict fix
confrict fix2

confrict fix2
xcodeproj add

xcodeproj add
Conflicts 12/26

Conflicts:
	Classes/TitleScene.cpp