Changed name of Servercom to Server
Added logic for testserver
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/Servercom.rb
Stuff