Daniel's Test

Signed-off-by: Daniel Shea <sadsheady@gmail.com>
daniels test

test
Merge branch 'master' of https://github.com/shadowfiles/CS-2340-Water-s-Warriors

Conflicts:
	.classpath
	bin/CS-2340-Water-s-Warriors.apk
	bin/classes.dex
	bin/resources.ap_
	src/cs2340/android/Model/User.java
Daniel's Test fix

Signed-off-by: Daniel Shea <sadsheady@gmail.com>
fixed some SystemCheck

^