bullshit
blah
Merge branch 'master' of https://github.com/rwedoff/dingus

Conflicts:
	Dingus-android/assets/images/pages-info.atlas
	Dingus-android/assets/images/pages-info2.png