Merge remote-tracking branch 'jeko/master'
update server
change sounds
replace httparty with web-socket-ruby gem
Merge branch 'master' into ws

Conflicts:
	lib/server.rb
switch Server from module to class - switch to websockets
add json gem
simpler update params structure