spiced up shit
a

Conflicts:
	public/css/main.css
	public/views/view_chat.html