Options route and logic added
resolved merge conflicts

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

Conflicts:
	src/test/java/org/mwolson/ServerTest.java