Show for match, migration
Merge branch 'master' of https://github.com/aarmora/ADota2League

Conflicts:
	app/controllers/matches_controller.rb
	app/views/matches/_match.html.erb
	app/views/matches/show.html.erb

	db/migrate/20140327230516_change_column_names_add_inactive_team_column.rb