fixed text error
Merge branch 'master' of github.com:FirstEast/1e-Disco

party merge
Merge branch 'master' of github.com:FirstEast/1e-Disco

goodale mirroring merge