n
Merge branch 'master' of https://github.com/ilantc/Magneton
adding the changed model