Merge pull request #27 from calebbradley/gh-pages

Master branch Catch up merge!