merge fix
merge fix
merge fix
merge fix
merge fix
Merge branch 'gh-pages' of github.com:agencia/tutorias into gh-pages

Conflicts:
	index.html
fix