mvs pattern works
mvc works (not sure if previous commit went through due to a local pull)
Merge branch 'master' of github.com:abbott221/WebsiteAndApp