simple changes to test git merging
simple changes to test git merging
Merge branch 'ggg'

Conflicts:
	src/main/webapp/view/user/user.jsp