Fixing up stuff
Merge branch 'master' of https://github.com/dcbenas/CS2340

Conflicts:
	CS2340Project/CS2340Project/bin/CS2340Project.apk
	CS2340Project/CS2340Project/bin/classes.dex
	CS2340Project/CS2340Project/bin/resources.ap_