Merge branch 'master' of https://github.com/joshcai/website
updated gitignore