Hopefully this works???
Merge branch 'master' of https://github.com/Zenspiration/sucCesspool

Conflicts:
	ParseStarterProject/bin/ParseStarterProject.apk
	ParseStarterProject/bin/classes.dex

ParseStarterProject/bin/classes/com/parse/starter/CircleDisplayActivity$
1$1.class

ParseStarterProject/bin/classes/com/parse/starter/CircleDisplayActivity$
1.class

ParseStarterProject/bin/classes/com/parse/starter/CircleDisplayActivity.
class
	ParseStarterProject/bin/resources.ap_