どんどｎ
解消！
Merge branch 'master' of https://github.com/st5757/App.git

Conflicts:
	firstText.txt