ja
Merge branch 'master' of https://github.com/jpamaya/depot

Conflicts:
	.idea/workspace.xml
cambios git