migration to move primary sponsor to sponsor table
merge upsream
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp

Conflicts:
	db/schema.rb
merge congress seed file
fix schema conflicts
rename cosponsor to sponsor in seed file
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp

Conflicts:
	db/schema.rb
rename cosponsors to sponsors
begin work on politician#show
begin work on user#show
continue work on web pages
finish table views
merge master
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp

Conflicts:
	app/views/politicians/index.html.erb