Bhavya
Merge branch 'master' of https://github.com/ShwetaSeth/cmpe281team5

Conflicts:
	src/main/webapp/WEB-INF/views/profile.jsp