とりあえず、コミット
Merge branch 'master' of https://github.com/TakafumiYano/kusog

Conflicts:
	KusogBank/.DS_Store