bim
Merge branch 'master' of https://github.com/LogicielEducatifFloBen/Anatom-Easy

Conflicts:
	src/FloBen/AnatomEasyBundle/Resources/views/Student/index.html.twig

ok