Changes from the server

These are some files that you had edited on the server directly, and were never included as a commit in Git.  I made a commit out of them, and you will need to "pull" that commit into your repository.  See how here:

https://help.github.com/articles/using-pull-requests

Note that in this particular case, it should be able to be merged just with the push of a button.  Also, if you want to see a summary of your changes, look here:

https://github.com/mmcghan/django-mmcghan/pull/1/files

Red lines marked with a "minus" are deletions, and green lines marked with a "plus" are additions.