Fixing stupid mistakes

-also moved index to assets
Merge branch 'switch-to-socketio' of github.com:fataku/dicemat into switch-to-socketio

Conflicts:
	app.js
	assets/index.html