Proyecto eventos
Merge branch 'master' of github.com:edagalon/eventos

Conflicts:
	README.md