merging latest styling changes
Will come back to text later. Moving on
Added roi's work, ready to hook up with rendering
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
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
t push origin bootstrapwMerge branch 'codepreneur-bootstrap' into bootstrap
Removed ffolio ctrl. Styling all messed up
Added links to collections in collections index
Working on collection show page - centered, magnifier working and thumbnails for navs
Texteditor no longer so messed up - spacing needs to be worked on though
Text works displaying in collection
Unique URL for each work. But the window reader needs working with