Trying to create a conflict with miguele
Merge branch 'Users' into eduardo
Again, trying to make a conflict
Delete miguele stupidity
Merge branch 'eduardo' into Users