Merge branch 'master' into Cole
styling in textEditor
Merge branch 'Cole'
Merge branch 'master' into Cole
Merge remote-tracking branch 'origin/Cole'