header + footer + side nav (not ready)
Merge branch 'develop' of https://github.com/gabquepa/proyecto_1 into develop

Conflicts:
	css/general.css