Merge branch 'canvas' 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 '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
Pen size and color
Merge branch 'frontend' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Create JSON when saving
Added user prpfiles for all users
Redirects guests to home from canvas
Merge branch 'master' into canvas
Fix syntax errors
FINALLY got image stuff working
Merge branch 'master' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Fix bugs with undo and pensize
Merge branch 'canvas' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Changed and fixed links
Last bit for today
Merged site