adding my conversations
difficulty scales
Merge branch 'master' of https://github.com/Hsad/Cocaine

Conflicts:
	Cocaine/src/MainScene.js
difficulty changes and new windows with random people
Merge branch 'master' of https://github.com/Hsad/Cocaine