working on text editor
Merge branch 'development' of https://github.com/oakes121/ConvoyQuick.git into development