Move marker asset files to assets/images
Merge branch 'wo-compiled-assets' into wo-map-markers
Merge branch 'master' into wo-map-markers
Merge branch 'master' into wo-map-markers
Increase timeout for geolocation
Move image assets to public directory
Merge pull request #37 from wh1tney/wo-map-markers

Move image assets to public directory
Merge remote-tracking branch 'origin/master' into filter_by_industry
full transitions now need back button to reverse
Merge branch 'master' into as-views
Merging master into transition for view
Merge pull request #38 from wh1tney/as-views

+1
Merge remote-tracking branch 'origin/master' into filter_by_industry
Filtering by industry