Merge branch 'master' of https://github.com/EmaInfres5ED/Emargement-Web into pabloDev
fix issue #34
merge confilc resolvation
changed the way i fix the issue #34
Merge pull request #37 from EmaInfres5ED/pabloDev

Fix issue #34