Merge pull request #5 from chemisax/master

生きてる生きてる！！
調整
Merge branch 'master' of https://github.com/kupoyuki/suizokukan

Conflicts:
	img/fish_anime/fish3.png
Merge pull request #2 from kupoyuki/master

Merge pull request #5 from chemisax/master