fixing a bad merge
Merge branch 'master' of https://github.com/awongh/rainbowsomewhere
fixing bad merge