Merge branch 'master' into site
Merge branch 'master' of github.com:stuycs-softdev/proj3-7-DWAI into site
Save canvas image
Fixed carousel display
Merge branch 'canvas' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Fixed carousel dimensions when no images
Added upload page
Profile still loads without a propic
Merge branch 'site' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Updated index.html with introduction
merge
Fixed carousel spacing problem
Added pop ups with full sized versions of the image in gallery
Fixed error messages
Merge branch 'site' of https://github.com/stuycs-softdev/proj3-7-DWAI into site
Commit changes, resolve merge conflicts