JanzChen_04
Merge branch 'master' of https://github.com/TestAozi/Watch

Conflicts:
	WatchWeb/bin/oz/bean/User.class
	WatchWeb/src/oz/bean/User.java