Merge branch 'prueba' of https://github.com/diegoduncan21/Neatics into diego
modales
Merge branch 'diego' of https://github.com/diegoduncan21/Neatics into diego
lala
Merge branch 'paulo' of https://github.com/diegoduncan21/Neatics into diego
haciendo logueo
new file:   users/__init__.py
modified:   users/views.py