Adding server stuff
Adding server stuff
Merge branch 'master' of https://github.com/Dwaligon/Dev