Basic HTTP server and a file to run testrequests
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/Servercom.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/Servercom.rb