Version change/added the option to change colors (Issue #20)
Merge branch 'master' into dev

Conflicts:
	CookieMonster.js
	src/Disp.js
	src/Main.js