Fixed some stuff for Greggory
Changed project from Cocos2D-X to Cocos2D and added testing framework
Changed framework paths
Finishing up framework; work begins on actual game tomorrow
Allowed PNGs to be added
Cleaning up
more cleaning
Merge branch 'Gregg' of https://github.com/gtscherer/Crouching-Tiger-Hidden-Platelet into Gregg

Conflicts:
	Bubblenauts/Bubblenauts.xcodeproj/project.pbxproj
	Bubblenauts/Bubblenauts/Classes/LineGenerator.cpp