Added small changes in app/views/activities/show.html.erb
Merge branch 'master' of https://github.com/Jon1213/activity_app
Merge branch 'master' of https://github.com/Jon1213/activity_app
Made work duration for walking, biking and griving for each selected activity.
Merge branch 'master' of https://github.com/Jon1213/activity_app
Changed locaton in seed.rb
Merge branch 'master' of https://github.com/Jon1213/activity_app
Merge branch 'master' of https://github.com/Jon1213/activity_app
Added Geolocation to the activity creation form  (app/views/activities/index.html.erb)
Merge branch 'master' of https://github.com/Jon1213/activity_app
Merge pull request #14 from jangelroa/master

Added Geolocation to the activity creation form  (app/views/activities/index.html.erb)