Fix server
Merge branch 'dev' of github.com:CodeForKids/rubysadventure into dev

Conflicts:
	server.rb