Clase User
fix conflict
merge
Merge branch 'master' of https://github.com/mngarriga/Bikestore