fixed merge conflicts
fixed collections page
now profile avatar updates
merging latest styling changes from jamie
merging latest styling changes
fixed merge conflict
Will come back to text later. Moving on
Added roi's work, ready to hook up with rendering
removed flex box
Amended click drag uploads for avatar
Profile avatar drag drop needs work. Collections index styled some more. About to start drag drop collection image editing
Profile pic drag and drop now almost perfect - but for a 1px margin at the top
profile styling foundations done
Currently user can't update collection picture in-page
merging master into bootstrap branch
Click drag edit for collection images working - though things aren't circular
solved master to bootstrap merge conflict
Collection changing images works perfectly
Merge branch 'bootstrap'
Fixed merge conflicts with v bootstrap