Merge branch 'master' of github.com:slpopejoy/tatterdemalion
starting over