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)
Merge pull request #15 from sufisidhu/master

addition of profile page + edits to positioning on index page with elements
Inserted activity creation form in the user's profile modal
Merge pull request #16 from jangelroa/master

Inserted activity creation form in the user's profile modal
edits to styling of profile page and index page
Merge branch 'master' of github.com:Jon1213/activity_app

edits to styling and positioning of homepage and profile elements

,