Removing some unrelated changes.
Merge branch 'grade_entry' of github.com:mike-stewart/Markus into grade_entry