FIX I HOPE
I'm not totally sure if I actually ended up fixing anything, but here are the changes I made yesterday.
Merge branch 'master' of https://github.com/Hsad/Cocaine

Conflicts:
	Cocaine/src/ChatWindow.js