fixed merge conflicts
fixed collections page
Images and json now working. Many things still red, however
now profile avatar updates
merging latest styling changes from jamie
merging latest styling changes
Merge branch 'bootstrap'
Fixing workselection json bug
Fixed json workselection bug
fixed merge conflict
removed flex box
profile styling foundations done
merging master into bootstrap branch
solved master to bootstrap merge conflict
Fixed merge conflicts with v bootstrap
t push origin bootstrapwMerge branch 'codepreneur-bootstrap' into bootstrap