unclear
Merge branch 'master' of https://github.com/cs147win2014/project

# By Isabelle Woodrow
# Via Isabelle Woodrow
* 'master' of https://github.com/cs147win2014/project:
  just undid what i did but pushed to wim first so we have analytics working although it's janky. woohoo
  trying to fix analytics. did something janky sorry

Conflicts:
	routes/view.js