Important announcement
Merge pull request #340 from eaescob/gh-pages

Important announcement
fixing layout
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages