COMIT
Merge branch 'master' of https://github.com/Mingok/ecleptica

Conflicts:
	ecleptica - estructura.sql