Merge pull request #4 from jakechen/master

Update gh-pages with new master