MVC changes
Merge branch 'master' of https://github.com/dsmi516/Project2