秋を追記
春の削除
Merge pull request #1 from milk-dropper/feature/秋の追加

Feature/秋の追加
Merge branch 'release/1105' of github.com:milk-dropper/makuranosoushi into release/1105

Conflicts:
	haruhaakebono.txt
コンフリクトを解決
rebase
Merge pull request #2 from milk-dropper/release/1105

Release/1105