check
Merge branch 'master' of https://github.com/Wenyao/LocUs

Conflicts:
	Locus/src/com/example/locus/entity/User.java