Merge pull request #2 from danmunz/master

Merging master into pages
Merge pull request #4 from danmunz/gh-pages

Pull july 4th into pages