updated web.config
checking in branch1.cs in branch1
commiting branch2 changes
Merge remote-tracking branch 'remotes/origin/branch1' into branch2

Conflicts:
	MvcApplication1/MvcApplication1.csproj
added first change
test
test
added first change
Merge branch 'branch1' into branch2

Conflicts:
	MvcApplication1/Models/Branch1.cs
change 1
change 2
change 3
change 1

Conflicts:
	MvcApplication1/Models/Branch1.cs
added change
made new change
changed new class added
changed new class added
Merge branch 'branch1' into branch2

Conflicts:
	MvcApplication1/Models/Branch1.cs
adding changes to branch 1
commit in branch2 itself