Chat
Merge branch 'master' of https://github.com/Sheeprider/yourcube

Conflicts:
	www/static/css/yourcube.css
	www/static/js/chat.js