池見6/23一回目
Merge branch 'master' of https://github.com/kihaya/mintabi

Conflicts:
	Thumbs.db
	minimum はま/app/resalt.html
	minimum はま/app/search_res.html
	minimum はま/app/検索結果画面.html
Merge branch 'master' of https://github.com/kihaya/mintabi