我
Merge branch 'master' of https://github.com/shahdat45ict/ComproOnlineApplication.git
s
Merge branch 'master' of https://github.com/shahdat45ict/ComproOnlineApplication

Conflicts:
	MyBlog/.classpath
email
email
s
Merge branch 'master' of
https://github.com/shahdat45ict/ComproOnlineApplication.git

Conflicts:
	MyBlog/src/sessioninview/User.java