added gem
merged Gemfile
made simple websocket-rails server / client
solved merge conflicts
revised gemfile.lock
merged branches