Fix Sourcecode Formatting
Fix code to be able to run Phase1-Tests
Merge pull request #4 from pgrm/Phase1-ServerFix

Phase1 server fix

now the Phase1-test works at least, even we don't pass it yet fully