Jackeline Piedrahita Garcia
CD1
CD2
CD3
CR1.01
CD4
CD5
CR1.02
CR1.03
Merge branch 'release-1.0' into develop

Conflicts:
	src/main/java/es/upm/miw/ECP1/Jackeline/Piedrahita/App.java
CD6
CD7
CR1.04
CR1.05
Merge branch 'release-1.0' into develop

Conflicts:
	src/main/java/es/upm/miw/ECP1/Jackeline/Piedrahita/App.java
CD8
CD9
CD10