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

Conflicts:
	Locus/src/com/example/locus/Demo.java
check
Merge branch 'master' of https://github.com/Wenyao/LocUs
check
Merge branch 'master' of https://github.com/Wenyao/LocUs
check
check
Merge branch 'master' of https://github.com/Wenyao/LocUs
chat application