Commit canvaspg.html
Changed backend
Merge branch 'site' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Fixed small error
Fixed toolbar login status on canvas page
Fixed dropdowns, made minor changes
Merge branch 'site' of github.com:stuycs-softdev/proj3-7-DWAI into frontend
Basic changes, put buttons into canvas toolbar
Add glyphicons, update canvaspg, bootstrap on changeinfo
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
Add new error alerts
Resolve merge conflicts
Resolve merge conflicts with master
Update register.html
Fix merge conflict
Merge branch 'master' into canvas
Fix syntax errors