updating readme
updating README
Merge branch 'master' into gh-pages
updating grid to not collapse