adding sockets
Merge branch 'master' of github.com:d4-ideas/Roshambattle

Conflicts:
	views/index.ejs
sockets working