Merge pull request #1 from blueprintsevent/master

Master
Merge pull request #2 from blueprintsevent/gh-pages

Merge pull request #1 from blueprintsevent/master