merge yo
Merge branch 'master' of https://github.com/joshgamer474/textEditor