git checkout needed for a file wich the server modifies
?
Merge branch 'master' of https://github.com/KUTCO/SchoolHub