Merge pull request #2 from shownotes/master

update
Merge pull request #3 from shownotes/master

update
Merge pull request #4 from shownotes/master

update
Merge branch 'master' of github.com:Drake81/about-us
Merge branch 'master' of github.com:shownotes/about-us