snap to 35x35 grid closes #8
merge conflict
Merge branch 'master' into gh-pages