Merge branch 'master' of https://github.com/silver-lu/empty-webserver

Conflicts:
	src/main/java/com/undecided/handlers/requestmethod/HttpGetMethodHandler.java