landing page entered
finished and reviewed design
Merge branch 'master' into gh-pages