Merge pull request #1 from christopherwoodrow/gh-pages

first merge
Merge pull request #2 from christopherwoodrow/master

pull