update
Merge branch 'master' of https://github.com/davidkao/davidkao.github.com

Conflicts:
index.html
Merge branch 'master' of https://github.com/davidkao/davidkao.github.com