next level message
Merge branch 'master' of https://github.com/rfblue2/Cognify

Conflicts:
	Cognify/bin/Cognify.apk
	Cognify/bin/classes.dex
	Cognify/bin/classes/com/cognify/main/GameActivity$MySurfaceView.class
	Cognify/bin/classes/com/cognify/main/GameActivity.class
	Cognify/bin/classes/com/cognify/main/Preferences$2.class
	Cognify/bin/classes/com/cognify/main/Preferences.class
	Cognify/bin/resources.ap_
Merge branch 'master' of https://github.com/rfblue2/Cognify