Merge pull request #1 from keithknox/master

time to merge!
Merge pull request #2 from keithknox/master

Update index.html
Merge pull request #3 from keithknox/master

next phase.
Merge pull request #4 from keithknox/gh-pages

merge