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
Merge branch 'frontend' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Added user prpfiles for all users
Redirects guests to home from canvas
FINALLY got image stuff working
Merge branch 'master' 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
Changed and fixed links
Last bit for today
Commit changes
Merged site