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

Conflicts:
	.travis.yml
	src/main/java/com/undecided/RequestHandler.java
	src/main/java/com/undecided/ServerResponse.java
	src/test/java/com/undecided/RequestHandlerTest.java