wtf
added the statistics page, changed the colors of the text
Merge branch 'master' of https://github.com/amandahandler/CS314Android

Conflicts:
	bin/classes.dex