added merge to toolkit
Merge branch 'master' of https://github.com/syholloway/mrcolor