add Server Test
Merge branch 'master' of https://github.com/bushize/empty-webserver

Conflicts:
	src/test/java/ServerTest.java