view change
view create4
Merge branch 'master' of github.com:u-akihiro/mini-project

Conflicts:
	app/views/blogs/index.html.erb