Working on "colaborar" page
Merge branch 'moving-to-github-post' into gh-pages

Conflicts:
	colaborar.md