jquery canvas, css grid layouts
aa
yay commit
fixed merge conflicts added canvas modal
merged and resolved conflicts, added modal for canvas
Merge pull request #6 from dustmr/development_branch

Development branch