Header casi terminado
Merge branch 'master' of https://github.com/adrian-zumbler/JAJASTORE

Conflicts:
	app/views/css/estilos.css
	app/views/stylus/estilos.styl