22
favicon
Merge branch 'master' of https://github.com/christiannwamba/C4ERepo

Conflicts:
	C4E/C4E/Views/Default/Index.cshtml
	C4E/C4E/Views/Shared/_Layout.cshtml