Changes to the websocket gem, and starting on adding to the world and player models
Resolved merge conflict