Add ro_pin
Fix Conflict

Conflicts:
	app/views/jantaku/index.html.erb
	config/routes.rb
Merge branch 'master' of https://github.com/kanpe777/Mahjong