Switching from TFS to GIT
committing before conflicts
Merge branch 'master' of https://github.com/lobotommy/MvcMovie