Merge branch 'quentin' of github.com:QuentinBontemps/TrybaProject into quentin
Merge branch 'quentin' of github.com:QuentinBontemps/TrybaProject into quentin
add stationAdapter
Merge branch 'quentin'
add search by login to userAdapter class
change columnName search in adapters
recup
Merge branch 'master' into antonin
add gitignore
Add login page
delete bin files
Merge branch 'antonin'
fixes conflict