Commit release
cambioaosrgioawerhio
rbgjirbbnwogwe
Merge branch 'release-1.0' into develop

Conflicts:
	src/egit/Clase1.java