Planeacion tocup maquetacion basica
Merge branch 'master' of https://github.com/CannedHead/Cepytin

Conflicts:
	config/routes.js
	views/especialidades/home.jade