made make work with the server and connection classes and so forth
Merge branch 'master' of https://github.com/mardrey/Eda031