20130826
test
Merge branch 'Eric' into Andy

Conflicts:
	db/migrate/20130826071841_add_column_to_match2.rb
	db/migrate/20130826072026_add_column_to_match3.rb