commit
commit
Merge branch 'release-1.0' into develop

Conflicts:
	src/EGit/ClaseEgit.java
commit develop
commit develop
commit de bug solucionado