add about
Merge branch 'about'
Merge branch 'master' into heroku