1

1
Merge branch 'master' of https://github.com/cycascovar/Thesisdev

Conflicts:
	chdesarrollo.sql