Not exactly sure what I did...
Merge branch 'master' of github.com:MCManager/MCManager-Server