cambios en informacion
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/stylesheets/styles.css
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 1aa012ff3fba807a261f8eb62b94985b1ebd6e87.
Merge branch 'master' of https://github.com/DanielCamposArce/Comunidad-Organizada

Conflicts:
	public/stylesheets/styles.css