new stuff
merge conflict repairs
Merge pull request #10 from thatknitter/grids

new stuff