basic cleanup
obligatory commit before separate branch test
temporarily finish test
Merge branch 'master' into student-upload

Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/application.html.erb