Merge branch 'prueba' of https://github.com/diegoduncan21/Neatics into diego
modales
Merge branch 'diego' of https://github.com/diegoduncan21/Neatics into diego
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch paulo
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   portal/static/css/index.css
	modified:   portal/templates/base.html
	modified:   portal/templates/eventos.html
	new file:   portal/templates/eventosGral.html
	modified:   portal/templates/infos.html
	new file:   portal/templates/noticias.html
lala
SingUp on
add fucking slash
Merge branch 'paulo' of https://github.com/diegoduncan21/Neatics into diego
haciendo logueo
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