Back to original
Merge remote-tracking branch 'refs/remotes/origin/master'
Ok
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	WebPage.cshtml