Merge pull request #1 from jacobswift/gh-pages

first commit pull request
third change commit
Merge pull request #2 from jacobswift/third-branch

third change commit pull request
Merge pull request #4 from jacobswift/newbranch

pulling in the third