removed duplicate web-sockets rails gem from gemfile
Merge branch 'master' of github.com:StephanMusgrave/ProjectX