blah blah
Merge branch 'master' of https://github.com/JorrieB/What

Conflicts:
	Projectfiles/GameLayer.m
	The game/TempWhat.xcodeproj/project.pbxproj
	The
game/TempWhat.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	The
game/TempWhat.xcodeproj/xcshareddata/xcschemes/TempWhat-Mac.xcscheme
	The
game/TempWhat.xcodeproj/xcshareddata/xcschemes/TempWhat-iOS.xcscheme
	The
game/TempWhat.xcodeproj/xcuserdata/lbreiman.xcuserdatad/xcschemes/xcsche
memanagement.plist
	The game/What.xcodeproj/project.pbxproj
	The game/What.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	The
game/What.xcodeproj/project.xcworkspace/xcshareddata/What.xccheckout
	The game/What.xcodeproj/xcshareddata/xcschemes/What-Mac.xcscheme
	The game/What.xcodeproj/xcshareddata/xcschemes/What-iOS.xcscheme
	The
game/What.xcodeproj/xcuserdata/jorriebrettin.xcuserdatad/xcschemes/xcsch
ememanagement.plist
	The
gradient/HeyaldaOpenGLCustomDraw.xcodeproj/project.xcworkspace/xcsharedd
ata/HeyaldaOpenGLCustomDraw.xccheckout
	The
gradient/HeyaldaOpenGLCustomDraw.xcodeproj/xcuserdata/lbreiman.xcuserdat
ad/xcschemes/xcschememanagement.plist
	What.xcodeproj/project.pbxproj
	What.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	What.xcodeproj/project.xcworkspace/xcshareddata/What.xccheckout
	What.xcodeproj/xcshareddata/xcschemes/What-Mac.xcscheme
	What.xcodeproj/xcshareddata/xcschemes/What-iOS.xcscheme

What.xcodeproj/xcuserdata/jorriebrettin.xcuserdatad/xcschemes/xcschemema
nagement.plist
deleting