Ajouts mineurs CSS
Merge + Resolve Conflicts

Conflicts:
	public_html/js/controllers.js
	public_html/partials/knowmore.html