changes to work1 that conflict with master
Merge branch 'work1'

Conflicts:
	MvcApplication1/MvcApplication1/Views/Home/About.cshtml
change to mastger 33
conflicting changes to  work1
Merge branch 'work1'

Conflicts:
	MvcApplication1/MvcApplication1/Views/Home/About.cshtml
commit to work2
Merge branch 'work2'

Conflicts:
	MvcApplication1/MvcApplication1/Views/Home/About.cshtml