working version of socket.io
Merge branch 'feature-socketio_intergration' into develop
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop

Conflicts:
	app/views/home/index.ejs
Socket IO sending message back and forth