Sound stuff....
1Merge branch 'master' of https://github.com/cfriedrich/CapstoneProject

Conflicts:
	LanguageInformant/LanguageInformant.WebUI/Views/Shared/_Layout.cshtml