non-editor commits in progress
Merge branch 'master' of github.com:ehhop/ehhapp
these are temporary files and don't belong in git