Gemfile OCD
Update seed data with bicycles and feet
Merge branch 'develop' of github.com:sstarr/journeyapp into develop
Add emission attributes to JourneyEntry
Merge branch 'develop' of github.com:sstarr/journeyapp into develop
I accidentally a migration
Calculate dem emissions
Merge branch 'develop' of github.com:sstarr/journeyapp into develop
Get devise working in modals
Merge branch 'develop' of github.com:sstarr/journeyapp into develop

Conflicts:
	app/models/journey_entry.rb