first commit
Merge github.com:bshackelford/bshackelford-dot-com
first commit after merge