add migration for trades/trade_rosters
begin work on trades views
finish new trade view (needs design)
migration to add status to rosters
style buttons on trade actions
add fk relationships in team table to handle to and from trade fks
finish trade actions
merge upstream master
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp

Conflicts:
	app/controllers/teams_controller.rb
	app/models/team.rb
	app/views/Teams/show.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	db/schema.rb
add back teams.show
fix minor bugs
minor style changes on user/show
trade enum status
active filter for team politicians
add active filter for rosters
Rename application and add skylight
Add skylight.yml file and use ENV for auth keys
fix route bug
Change app name to FantasyPolitics
Merge branch 'master' of heroku.com:fantasypolitics-staging into develop
Merge master into develop to grab Skylight changes

Merge branch 'master' into develop

Conflicts:
	Gemfile.lock