emploi du temps hors de tout danger ! (UMPALOUPA!)
Merge branch 'master' of https://github.com/LaBrush/KUB

Conflicts:
	web/ressources/sass/partials/pages/_agenda.scss
	web/ressources/stylesheets/main.css