bugfixes in grid
Merge branch 'master' of https://github.com/Torthu/Lattice-2

Conflicts:
	scss/grid.scss