Trying to merge the two
Merge branch 'master' of github.com:hawaiianchimp/CSE135-Project

# By Bonnie (1) and vpcombo (1)
# Via Bonnie
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  Big fix in analytics.jsp
  heroku change

Conflicts:
	WebContent/analytics.jsp
Changed Header queries