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

Conflicts:
	server.rb
using for in as index
Fix up events channel
Merge branch 'dev' of github.com:CodeForKids/rubysadventure into dev