direcotry
Merge branch 'master' of https://github.com/jkarson/TextEditorProj
final project