ok
last commit
Merge branch 'temp1'

Conflicts:
	app/assets/javascripts/BackGround.js
	app/views/main/index.html.erb
	lib/websocket.rb