Kinda works?
Merge remote-tracking branch 'origin/master'

Conflicts:
	ViRT MVC/MvcApplication1/Views/Home/Index.aspx