Latest changes / colors for intro
Merge branch 'develop' of github.com:parallax-unit/website into develop