A commit 4
ccc
gggg
vbv
Merge branch 'master' of https://github.com/newlifewj/projects.git
kjkjk
Merge branch 'master' of https://github.com/newlifewj/projects.git
dsdsdddd
hghg
kjjk
Merge branch 'master' of https://github.com/newlifewj/projects.git

Conflicts:
	WebDemo/src/com/webdemo/www/m1/domain/AppUser.java
5