base de datos
Please enr the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.

(use "git pull" to update your local branch)

	modified:   CupiCoordinador/app/models/estudiante.rb
	modified:   CupiCoordinador/app/models/materia.rb
	modified:   CupiCoordinador/app/models/pensum.rb
	modified:   CupiCoordinador/app/models/semestre.rb
	modified:   CupiCoordinador/app/views/coordinador/consolidado.html.erb
	modified:   CupiCoordinador/config/routes.rb
ahora si van los archivos de bd
Merge branch 'master' of https://github.com/sotomelendez/CupiCoordinador

Conflicts:
	CupiCoordinador/app/views/coordinador/consolidado.html.erb