These changes look accidental.  You can get rid of them as follows:
1) Checkout your branch
2) Undo the changes above (I think you can do this using some variant of `git checkout master common/djangoapps/student/views.py`)
3) Squash the commit using `git rebase --interactive` (ask about this at the lunch and learn @dianakhuang is doing tomorrow)
4) Push the changes to your branch.