Added server functionality
Manual testing working
Unit tests failing with "ant test"
Merge branch 'master' of https://github.com/Developmino/dsws13m2.git