Merge pull request #27 from calebbradley/gh-pages

Master branch Catch up merge!
Merge pull request #28 from calebbradley/master

Merge pull request #27 from calebbradley/gh-pages