Resolves a few conflicts within master stylesheet that was preventing the page to render correctly.
Merge pull request #1 from jessepinuelas/master

Resolves a few style conflicts between master/ghpage branches