Merge branch 'master' of https://github.com/silver-lu/empty-webserver
Merge branch 'master' of https://github.com/silver-lu/empty-webserver
commit DirectoryListTest for testing hidden file and directory
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