Trying to fix my branch..
Merge branch 'master' of https://github.com/blakewellington/CS457Project

Conflicts:
	Code/WebServer.lhs
Revert "Trying to fix my branch.."

This reverts commit 66c98a237af86b1879b0cf564b722407ea93a10d.

Conflicts:

	Code/WebServer.lhs