Fixed overflow in /grid
Merge branch 'master' of https://github.com/andrewmcwatters/public