Merge branch 'frontend' of github.com:ayuinc/UTEC_v2 into frontend

Conflicts:
	frontend/stylesheets/main.css
	frontend/stylesheets/main.css.map
alineacion de la seccion carreras - home

lkjsd
alineacion de la seccion carreras - home
Merge branch 'master' into frontend

Conflicts:
	frontend/stylesheets/main.css
Merge branch 'master' into frontend
solucion de conflictos-2
solucion de conflictos-3
Merged 'dev' branch