20130826
test
Merge branch 'Eric' of https://github.com/dream78829/wesport into Eric

Conflicts:
	db/migrate/20130826071841_add_column_to_match2.rb
	db/migrate/20130826072026_add_column_to_match3.rb
Merge branch 'Eric' of https://github.com/dream78829/wesport into Eric

Conflicts:
	app/controllers/players_controller.rb
	app/views/records/new.html.erb
	app/views/teams/_form.html.erb
	app/views/welcome/index.html.erb