some server crap
Merge branch 'master' of https://github.com/dglittle/gitDesk