Merge branch 'jmwhicke'

Another test merge...
Commit & push test on master.
Merge branch 'master' of https://github.com/jmwhicke/whick_blog

Test test test grrrr!