到達度表示機能の追加
Merge branch 'master' of https://github.com/heuris-taro/r_learning

Conflicts:
	app/controllers/admin_controller.rb
	db/schema.rb
Merge remote-tracking branch 'origin/master'