Updating code for final submission
Trying again
Merge branch 'master' of https://github.com/Ekarg/CSCE315Project3

Conflicts:
	Project3/bin/classes.dex