Conflicto de versiones
Merge branch 'master' of https://github.com/zeroexu/tercosystem

Conflicts:
	greenDog/.DS_Store