static pages test
Registro y login
actualizando rama
actualizar rama
test registro
actualizacion
merger
funciona login
merge with master
Login y logut correctos
2
MicroPost included
Merge branch 'master' into development

Conflicts:
	bbdd
Arreglado bug con micropost
Merge branch 'master' of https://github.com/DSI-ETSII-ULL/DEA
Merge branch 'development'

Conflicts:
	raven/templates/home.html
	static/css/style.css
cambio a master
master
ssa
merge