Work
Merge remote-tracking branch 'origin/master'

Conflicts:
	NewYo/NewYo.csproj
	NewYo/Views/Home/Index.cshtml