Adding color schemer studio 2
Merge branch 'color-schemer-studio' of github.com:iloveitaly/mackup into iloveitaly-color-schemer-studio

Conflicts:
	CHANGELOG.md