あああ
Merge branch 'master' of github.com:herpes/texas

Conflicts:
	app/controllers/texas_controller.rb
	app/views/texas/texas.html.erb
test
test
Merge branch 'master' of github.com:herpes/texas

Conflicts:
	app/controllers/texas_controller.rb
	app/views/texas/texas.html.erb
ボタンを押すと当番（名前の頭の●）が順番に回っていくようにした