added first version of the erm
Merge branch 'master' of https://github.com/MasterRepos/bugfree-octo-ironman