Update README.md
Merge branch 'develop' of https://github.com/cgastrell/papagayo into develop
arreglado resize de thummbnails
Merge branch 'develop' into gh-pages

Conflicts:
	README.md