initialized server
Merge branch 'master' of https://github.com/Witchwa/Object-Oriented-Analysis-and-Design-Pro2-E-E
merget test