changing colors
Merge branch 'master' of https://github.com/theship/theship.github.io