git init
Merge branch 'master' of https://github.com/DIGnmg/colorMixer

Conflicts:
	README.md