coucou
coucou
Merge branch 'master' of https://github.com/chriscx/DeLaLicorne

Conflicts:
	application/views/footer.php
	application/views/idkwiw.php
	application/views/suggestion.php