merge everything
Merge branch 'master' of github.com:cth-housemouse/housemousekj
major fix