conversations can be added now
Merge branch 'master' of https://github.com/Hsad/Cocaine
gonna grab stuff
Merge branch 'master' of https://github.com/Hsad/Cocaine
Merge branch 'master' of https://github.com/Hsad/Cocaine

Conflicts:
	Cocaine/src/MainScene.js
Merge branch 'master' of https://github.com/Hsad/Cocaine
what did he did?
Merge branch 'master' of https://github.com/Hsad/Cocaine

Conflicts:
	Cocaine/src/MainScene.js
font size change and that is literally it.
Merge branch 'master' of https://github.com/Hsad/Cocaine

Conflicts:
	Cocaine/src/MainScene.js
Merge errors fixed
Merge branch 'master' into ben

Conflicts:
	Cocaine/src/MainScene.js