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

Conflicts:
	firstText.txt