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

Conflicts:
	src/main/java/com/undecided/DirectoryLister.java
	src/test/java/com/undecided/DirectoryListerTest.java
Merge branch 'master' of https://github.com/silver-lu/empty-webserver

Conflicts:
	src/main/java/com/undecided/DirectoryLister.java
	src/test/java/com/undecided/DirectoryListerTest.java
Merge branch 'master' of https://github.com/silver-lu/empty-webserver

Conflicts:
	src/main/java/com/undecided/handlers/HttpGetMethodHandler.java
	src/main/java/com/undecided/utils/DirectoryLister.java
	src/test/java/com/undecided/RequestHandlerTest.java
Merge branch 'master' of https://github.com/silver-lu/empty-webserver

Conflicts:
	src/main/java/com/undecided/handlers/HttpGetMethodHandler.java
	src/main/java/com/undecided/utils/DirectoryLister.java
	src/test/java/com/undecided/RequestHandlerTest.java
Merge branch 'master' of https://github.com/silver-lu/empty-webserver