aa
Merge branch 'master' of https://github.com/meloko23/SILCD

Conflicts:
	SILCD/Content/Site.css
	SILCD/Content/images/logo.png
	SILCD/Views/Home/Index.cshtml