re-added correct placeholder path
Merge branch 'master' of github.com:jackjeffress/activityfinder
Merge branch 'master' of github.com:jackjeffress/activityfinder
ready to push
fixed intro text in modal
Merge branch 'master' of github.com:jackjeffress/activityfinder
uncommented geocoder in models
Merge branch 'master' of github.com:jackjeffress/activityfinder
Merge branch 'master' of github.com:jackjeffress/activityfinder
removed old css files
minor changes
merging andy changes