IDK

Committing
Merge branch 'master' of https://github.com/will06hm/Good-Samaritan

Conflicts:
	bin/GoodSamaritan.apk
	src/com/example/goodsamaritan/SignInActivity.java