エラーあったからコメントアウト
Merge branch 'master' of https://github.com/nagano2014/TextEditor
Merge branch 'master' of https://github.com/nagano2014/TextEditor
Merge branch 'master' of https://github.com/nagano2014/TextEditor