Got grid system set up
Fixed merge conflicts
Merge pull request #2 from jamienf/sd-grid-system

Got grid system set up
Updated the pig to have a higher Z-index
Merge branch 'master' into jf-move-pig