Adding models
Trying to fix merge conflicts
Merge branch 'master' of https://github.com/sclin929/Engauge