merge des code, final ?
Merge branch 'master' of https://github.com/FloFrancois/The_Working_Day

Conflicts:
	Projet/Sources/js/employee.js
	Projet/Sources/js/main.js
	Projet/Sources/js/states.js