Merge pull request #1 from leoachear/gh-pages

Merge Master y gh-pages
Revert "Merge Master y gh-pages"
Merge pull request #2 from leoachear/revert-1-gh-pages

Revert "Merge Master y gh-pages"
Merge pull request #3 from leoachear/master

Merge gh-pages con master