commit8
Merge branch 'master' of https://github.com/kawamagi/repo4

Conflicts:
	config/routes.rb
commit9