fix to grid
git
Merge branch 'master' of https://github.com/kjergens/my-web