.
Merge branch 'master' of https://github.com/tomiduss/cse135_shop

Conflicts:
	WebContent/analytics.jsp