Menu del lado de losbaners terminado
Agrego homeInformatorio.html pero sin nada
Mejora del footer
Mejora del footer 1
users
fin menuBanners
new file:   users/__init__.py
modified:   users/views.py
Merge branch 'menuBanners' of http://github.com/diegoduncan21/Neatics into paulo

Conflicts:
	portal/templates/nav-home.html
modified:   portal/static/js/banners.js
modified:   portal/templates/banners.html
modified:   portal/templates/base.html
modified:   portal/templates/home.html
deleted:    portal/templates/modal_login.html
deleted:    portal/templates/modal_registrar.html
correccion cirujeada banners js
Merge branch 'diego' of http://github.com/diegoduncan21/Neatics into paulo

Conflicts:
users/views.py

modified:   .gitignore
deleted:    base.db
modified:   portal/templates/base.html
modified:   users/views.py
Merge branch 'menuBanners' of http://github.com/diegoduncan21/Neatics into paulo
Merge branch 'diego' of http://github.com/diegoduncan21/Neatics into paulo

Conflicts:
	base.db

Changes to be committed:
modified:   portal/templates/base.html
modified:   users/urls.py
modified:   users/views.py
Merge branch 'master' of http://github.com/diegoduncan21/Neatics into paulo

Conflicts:
	users/urls.py
	users/views.py

Changes to be committed:
modified:   Neatics/settings.py
new file:   users/models.py
new file:   users/static/js/index.js
new file:   users/templates/base_users.html
new file:   users/templates/index_users.html
new file:   users/templates/registration/login.html
new file:   users/templates/registration/register.html
new file:   users/tests.py
Logs on
listo signup