goodale hacks
Merge branch 'master' of https://github.com/FirstEast/1e-Disco