Merge branch 'master' of https://github.com/wbelpage/Gramophone

Conflicts:
	Gramophone.Web/Views/Home/Index.cshtml
Merge branch 'master' of https://github.com/wbelpage/Gramophone

Conflicts:
	Gramophone.Web/Views/Home/Index.cshtml