bootstarpあてこみ．
Merge branch 'develop' of github.com:primalcode/frs into develop

Conflicts:
	app/views/matches/index.html.erb