first commit on SecondBranch
merge Second with First

Conflicts:
	MvcApplication1/MvcApplication1/Controllers/HomeController.cs
new commit after merge