some more updates
Merge branch 'master' of github.com:tony56a/website into gh-pages