Got a bit carried away.
Merge branch 'master' of github.com:lwholeyCPSC/TextEditor