Added new icon
Source logo files
Merge branch 'master' of https://github.com/amandahandler/CS314Android

Conflicts:
	bin/classes.dex
	bin/classes/com/example/foundationsofsuccessfulprogramminginjava/QuestionPage.class
	bin/resources.ap_