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

Conflicts:
	db/schema.rb
Add bill#index action and populate its view

Fix merge issue in Gemfile
Merge pull request #6 from lexh/master

importing cosponsors
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp
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
Style devise pages to look FABULOUS
continue work on web pages
finish table views
Begin designing politician show page - generally the same for other show pages
merge master
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp

Conflicts:
	app/views/politicians/index.html.erb
Add onclick event to table rows for linking to show actions
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp
remove politicians_bills table
change relations
merge master
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp
Revisit how alerts are shown on the site

Wrap devise error messages in bootstrap style alerts
add js tags
remove bills_politicians
Remote co-sponsors list from politician/show
Merge branch 'master' of https://github.com/fantasypolitics/startupweekendmvp