last changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	CaughtItHere/Content/Site.css
	CaughtItHere/Views/Home/Index.cshtml