cambio

links a paginas del tec
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/estilos.css
Merge branch 'master' of https://github.com/AldoRG/Cipitech2014

Conflicts:
	css/estilos.css
	index.html
	stylus/estilos.styl