This should be the first working version of the server
Merge branch 'master' of https://github.com/hurlbut/CMPUT404-assignment-webserver

Conflicts:
	not-free-tests.py