some final commits before major batch changes on home computer
Merge branch 'master' of https://github.com/cpadavis/secret-adventure

gotta do this!