changes
new
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	MovieMasterProject/MovieMasterProject/Views/Home/Index.cshtml