User controller added
Merge branch 'master' of github.com:pratik14/booking

Conflicts:
	app/assets/javascripts/websocket.js.coffee