201308221536, Andy merge to develop
Merge branch 'develop' into Eric
201308221738,change CSS
Merge branch 'Andy' into Eric

Conflicts:
	app/controllers/records_controller.rb
	app/models/game.rb
	app/models/record.rb
	app/views/records/_form.html.erb
	app/views/records/index.html.erb
	db/schema.rb
201308261122,index
201308261123
Merge branch 'Andy' into Eric

Conflicts:
	app/models/game.rb
	app/views/devise/sessions/new.html.erb
201308261302
201308261318
Merge branch 'Andy' into Eric

Conflicts:
	app/controllers/records_controller.rb
	app/models/game.rb
	app/models/record.rb
	app/views/records/_form.html.erb
	app/views/records/index.html.erb
	db/schema.rb
201308261323
201308261501

add controller "welcome"
change model "match"
change view "welcome"
change route,set welcome#index as root
Merge branch 'Eric' into Andy

Conflicts:
	app/views/records/_form.html.erb
20130826
201308261523

change model "matches", add two columns named "team" and "user_id"
Merge branch 'Eric' into Andy

Conflicts:
	app/models/team_user.rb
	app/views/layouts/application.html.erb
201308261736

合併「球員」及「賽事」為「球隊」
test
Merge branch 'Eric' into Andy

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:
	db/migrate/20130826071841_add_column_to_match2.rb
	db/migrate/20130826072026_add_column_to_match3.rb