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
Merge branch 'master' into site