Updated ERM, no email
Merge branch 'master' of github.com:pbat3h12b/Schnitzeljagd