Merge pull request #4 from jakechen/master

Update gh-pages with new master
Merge pull request #5 from jakechen/gh-pages

Merge pull request #4 from jakechen/master