1
Merge branch 'master' of https://github.com/VurtneWk/RiversAndLakes.git
Merge branch 'master' of https://github.com/VurtneWk/RiversAndLakes.git
1
Merge branch 'master' of https://github.com/VurtneWk/RiversAndLakes.git

Conflicts:
	WebContent/WEB-INF/jsp/personal/personalInfo.jsp