Fixed performance issue on log in
Fix run the sort
Student only submit preferences once
Testing
Fix instructions. Warn users that they will be logged out
Merge branch 'master' of https://github.com/garrettdreyfus/Block

Conflicts:
	crush/views.py