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

# By Isabelle Woodrow (1) and mnburkle (1)
# Via Isabelle Woodrow
* 'master' of https://github.com/cs147win2014/project:
  yay for editable tables
  fixed tabbing and missing }

Conflicts:
	routes/view.js