agregando un rar de onda
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'master' of github.com:francovenica/GitFlow

Conflicts:
	README.md