server added
Merge branch 'master' of https://github.com/JimmyFarcy/GTrotter_Website