primer commit
Merge branch 'master' of https://github.com/luchopcerra/redsolidaria

Conflicts:
	.gitignore
	LICENSE
	README.md
Merge branch 'master' of https://github.com/luchopcerra/redsolidaria

Conflicts:
	LICENSE