Created gh-pages branch
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	chapters/01_introduccio.md
Generated resulting files