4
Merge branch 'master' of https://github.com/PioneerWeb/Githubtesting

Conflicts:
	Githubtesting/Views/Home/Index.cshtml