Merge branch 'dev'

Conflicts:
	package.json
	public/css/style.css
	public/js/denma.js
	socketIO.js
	views/index.ejs
Merge branch 'dev'