update layout
Merge branch 'develop' of github.com:parallax-unit/website into develop
update projects
merge
update work page