conflicted
Merge branch 'master' of github.com:10310243/cs4400Final

Conflicts:
	CS4400/Views/Shared/_Layout.cshtml