Only TAs can delete people now
Merge branch 'master' of github.com:mkc1993/Q

Conflicts:
	app/public/javascripts/login.js
	app/routes/index.js
	app/views/.login.jade.swp
	app/views/login.jade