updated grid system
Merge branch 'master' of https://github.com/daynearron/Jen-Lovely