ignore this
strange changes
GAmeActivity Added

And shape image strings added
New Shapes
Merge branch 'master' of https://github.com/rfblue2/Cognify
SurfaceView

Created SurfaceView
Created level menu
Fixing merge conflicts
SurfaceView Almost finished

With a test bitmpa
Merge remote-tracking branch 'origin/Roland'
Merge branch 'master' of https://github.com/rfblue2/Cognify

Conflicts:
	Cognify/bin/classes/com/cognify/loader/LevelLoader.class
	Cognify/bin/classes/com/cognify/main/R$drawable.class
	Cognify/bin/classes/com/cognify/main/R$id.class
	Cognify/bin/classes/com/cognify/main/R$layout.class
	Cognify/bin/classes/com/cognify/main/R$menu.class
	Cognify/bin/classes/com/cognify/main/R$string.class
	Cognify/bin/classes/com/cognify/main/R$style.class
	Cognify/gen/com/cognify/main/R.java
Shape

Minor edit to match new images