Merge branch 'master' into Cole
styling in textEditor
Merge branch 'Cole'
Merge branch 'master' into Cole
Merge pull request #4 from GigaBots/Cole

Cole