MvcMovie
MVC Movie
test
Merge branch 'master' of https://github.com/j0sanc02/cis411-77_homework

Conflicts:
	homework5/MvcMovie/MvcMovie.v12.suo
	homework5/MvcMovie/MvcMovie/App_Data/Movies.mdf
	homework5/MvcMovie/MvcMovie/App_Data/Movies_log.ldf
	homework5/MvcMovie/MvcMovie/Models/Movie.cs
	homework5/MvcMovie/MvcMovie/Web.config
	homework5/MvcMovie/MvcMovie/bin/MvcMovie.dll
	homework5/MvcMovie/MvcMovie/bin/MvcMovie.dll.config
	homework5/MvcMovie/MvcMovie/bin/MvcMovie.pdb
	homework5/MvcMovie/MvcMovie/obj/Debug/MvcMovie.csproj.FileListAbsolute.txt
	homework5/MvcMovie/MvcMovie/obj/Debug/MvcMovie.csproj.GenerateResource.Cache
	homework5/MvcMovie/MvcMovie/obj/Debug/MvcMovie.csprojResolveAssemblyReference.cache
	homework5/MvcMovie/MvcMovie/obj/Debug/MvcMovie.dll
	homework5/MvcMovie/MvcMovie/obj/Debug/MvcMovie.pdb