Merge pull request #1 from amymok/gh-pages

Merge gh-pages into Master
Merge pull request #2 from amymok/gh-pages

Merge in gh-pages
Add initial changes