Updated 404.html
Deleted swp file
Merge branch 'gh-pages' of http://github.com/chiayolin/www.chiayolin.org into gh-pages