Bouton create
plus besoin de la creation pour notre tâche
LYUYOU
Merge branch 'master' of https://github.com/eclar/mines-travel
merge conflict with func 2,3 solved
Merge branch 'fixLogin'
Merge branch 'master' of https://github.com/eclar/mines-travel
Merge branch 'mednic' of https://github.com/eclar/mines-travel

Conflicts:
	src/main/webapp/WEB-INF/views/hotels/bookingsTable.jsp