Merge branch 'master' of github.com:edsloan/g.css
Merge branch 'develop'
Merge branch 'master' of github.com:edsloan/g.css
Layout adjustment