cleaned up server so it should never crash...
Merge branch 'master' of https://github.com/rkreiter/javaProject4