Commit canvaspg.html
Merge branch 'canvas' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Fixed dropdowns, made minor changes
Merge branch 'site' of github.com:stuycs-softdev/proj3-7-DWAI into frontend
Merge branch 'frontend' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Attach undo and redo to buttons
Basic changes, put buttons into canvas toolbar
Merge branch 'master' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Merge branch 'frontend' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Merge branch 'canvas' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Add glyphicons, update canvaspg, bootstrap on changeinfo
Pen size and color
Merge branch 'frontend' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Create JSON when saving
Merge pull request #5 from stuycs-softdev/canvas

Undo and redo strokes
Merge branch 'master' of github.com:stuycs-softdev/proj3-7-DWAI
Add new error alerts
Resolve merge conflicts
Resolve merge conflicts with master
Update register.html