Prueba logica 1
Prueba 1 - Commit 2
Merge tag 'v0.1.0' into develop

v0.1.0
Crear features cruzadas.
Commit 2 - prueba 2
commit 2 - prueba 1
Merge branch 'feature/prueba2' into develop
Merge branch 'feature/prueba1' into develop
Merge branch 'develop' of https://github.com/carmanns/gitflow into develop

Resueltos los conflictos de trabajar en las mismas lineas con dos features distintas.

Conflicts:
	readme.txt
Agregar CHANGELOG
Merge branch 'release/v0.2.0' into master