mispelling in seed file
fixed models
updated search so google maps renders when search parameter is given
continued working on preliminary views
Merge pull request #24 from oafridi/dynamic-views-1st

added initial ifs for conditional displaying of private-facing links
making partials for user view
resolved merge conflicts for user views and partials
Merge pull request #26 from oafridi/AR_fix

AR - fix hosted_events
positioning users page
Merge pull request #27 from oafridi/chrstine-monday2

positioning users page
Merge pull request #28 from oafridi/modals

modal completed
Revert "modal completed"
Merge pull request #29 from oafridi/revert-28-modals

Revert "modal completed"...there are some issues with the modals so, rollback
updated search so google maps renders when search parameter is given
maps changes
Merge branch 'google_maps' of https://github.com/oafridi/cultivating_commerce into google_maps
Merge pull request #30 from oafridi/google_maps

Google maps
Revert "Google maps"
Merge pull request #31 from oafridi/revert-30-google_maps

Revert "Google maps" because it broke home page
added images to assets and seedfile