Merge remote-tracking branch 'upstream/master'

Conflicts:
	DiceRoll/Controllers/HomeController.cs
	DiceRoll/Properties/AssemblyInfo.cs
	DiceRoll/Views/Home/About.cshtml
	DiceRoll/Views/Home/Index.cshtml
	DiceRoll/Views/Shared/_Layout.cshtml
	DiceRoll/Web.config