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