Merge pull request #2 from pbnutelladdict/branch-textedit

merging with pizza
updateしたよ

machieだよ
Merge pull request #3 from machie-gh/branch-machie

Branch machie