Resolved merge conflicts - the only problem remaining is with line 7 of user/jbuilder
Problems with editor
Texteditor looks a bit better. Need to customize the form
Commit
COmmit
now profile avatar updates
merging latest styling changes from jamie
Merriweather now default font for texteditor
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