CD4
CD5
Merge branch 'release-1.0' into develop
CD6
CD7
Merge branch 'release-1.0' into develop
CD8
CD9
Create README.md
CD10
Merge branch 'develop' of https://github.com/huguet10/ecp1CarlosHuguet.git into develop
Merge branch 'develop' into release-1.0

Conflicts:
	README.md