Minor
Merge branch 'master' of https://github.com/Line-Up-Admin/CSE-403-Spring2014

Conflicts:
	app/static/js/controllers.js
	app/static/partials/edit_queue.html