Merge pull request #1 from hudsonmarinho/gh-pages

base-site
Merge pull request #2 from hudsonmarinho/master

Merge pull request #1 from hudsonmarinho/gh-pages