Mimer .xyz1
Merge branch 'master' of https://github.com/bgabor90/DistributedSystems
 Web Server
Jeez
Merge branch 'master' of https://github.com/bgabor90/DistributedSystems

Conflicts:
	Mimer/MyWebServer.java