Merge branch 'master' into Cole
Merge branch 'Cole'
reworking textEditor. Concision. Accuracy.
Merge branch 'Cole'