Seleccionar tesis para crear compromisos
Seleccionar tesis para crear compromisos
Merge branch 'master' of https://github.com/laurisc/GestorTesis_v2

Conflicts:
	app/models/compromiso.rb
	db/schema.rb
Merge branch 'master' of https://github.com/laurisc/GestorTesis_v2

Conflicts:
	db/migrate/20130313224644_create_profesors.rb
	db/schema.rb
	log/development.log