images now appear when called
Conflicts resolved. Image test passes

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

Conflicts:
	src/main/java/org/mwolson/FileServerHandler.java
Merge branch 'master' of https://github.com/mwolson/empty-webserver