トーナメント機能作成途中
cardモデルの作成
cardのmigrationを変更
参加者に応じて組み合わせを作成する機能を実装。
Merge commit 'c412d74207f2ce622d3390833ea829e3aed0ef96'

Conflicts:
	app/models/matching.rb
	config/routes.rb
	db/schema.rb
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/8c2b061e379a23e7c4d207adcf992462
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d585a06e2ee6203ccb04c8b84150d14d
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid