Merge branch 'gh-pages'
added about.html and images
Merge branch 'master' into gh-pages