Add jquery to static, update html files
Merge branch 'master' of github.com:stuycs-softdev/proj3-7-DWAI into frontend
Fixed gallery display
Gallery images working
Merge pull request #8 from stuycs-softdev/site

Fixed gallery display
Merge branch 'master' into site
Merge pull request #9 from stuycs-softdev/canvas

Fix bug with undo/redo
Merge branch 'master' of github.com:stuycs-softdev/proj3-7-DWAI into site
Edit save/delete buttons on canvaspg
Commit changes and merge with master
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