first update of the code
Merge branch 'master' of https://github.com/jgararuna/grupo4

Conflicts:
	README.md