広告エリアのサイズを変えた
Merge branch 'master' of https://github.com/kazhida/famn

Conflicts:
	app/views/entries/index.html.slim
Merge branch 'master' of https://github.com/kazhida/famn

Conflicts:
	app/views/entries/index.html.slim