add account stuff, yo
Merge branch 'CODE-M6-HERE' of https://github.com/shadowfiles/CS-2340-Water-s-Warriors into CODE-M6-HERE

Conflicts:
	bin/classes/cs2340/android/Activities/LoginActivity.class
	bin/classes/cs2340/android/Activities/SucessActivity.class