Merge pull request #2 from stephaniedawn/master

Merge pull request #1 from stephaniedawn/gh-pages
Merge pull request #3 from stephaniedawn/gh-pages

Merge pull request #2 from stephaniedawn/master