Merge pull request #3 from dfminnojr/Sharif

Sharif
fixed merge conflicts
Merge branch 'master' of https://github.com/dfminnojr/MinnovativeSolutions into Sharif