Merge branch 'master' of https://github.com/hawaiianchimp/CSE135-Project

Conflicts:
	WebContent/analytics.jsp
conflict