updated
Merge branch 'gh-pages' of https://github.com/b71208/ASD_GitHub into gh-pages