Merge branch 'canvas' of github.com:stuycs-softdev/proj3-7-DWAI into canvas
Merge branch 'canvas'
Merge branch 'master' of github.com:stuycs-softdev/proj3-7-DWAI
Attach undo and redo to buttons
Merge branch 'master' into site
Updated index.html
Merge pull request #5 from stuycs-softdev/canvas

Undo and redo strokes
Merge branch 'master' of github.com:stuycs-softdev/proj3-7-DWAI
Fix merge conflict
Commit changes