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

Conflicts:
	src/main/java/com/undecided/DirectoryLister.java
	src/test/java/com/undecided/RequestHandlerTest.java
Merge remote-tracking branch 'origin/master'