added more content
finished designing
Merge branch 'master' into gh-pages