T_T
Merge branch 'master' of https://github.com/cs307-team13/scry

Conflicts:
	android/scry/src/edu/purdue/cs307/scry/User.java