Deleted excel :D
Redirect to bookings on login
user controller
Merge branch 'master' of github.com:jacobtardieu/MinesTravel
Add my bookings button
Remove mac file crap
Merge pull request #1 from jacobtardieu/julienJacob

Task 3
Added amenities
Cancel button working
Merging lucas' functionalities
merge UserController
merge
blabla
Added user service into code
Added user service into code
add my profile boutton
Merge remote-tracking branch 'origin/UserService' into profile
Test de pagination fonctionnelle et reussi
my profile
Merge branch 'profile' into thomasAdrien