committing to pull
resolved conflicts and updated report
Merge branch 'master' of github.com:kbladin/Modeling-project
updated report