agregado postgresql
Merge branch 'master' of https://github.com/JosueZelaya/cmpy.git

Conflicts:
	pom.xml