Branch-Test1
Merge pull request #4 from Informatik-13b/Server

Branch-Test1