Merge branch 'leafly_engine' of github.com:fluxusfrequency/milehigh
add rails_12factor gem
Merge branch 'leafly_engine' of github.com:fluxusfrequency/milehigh
add splash template
add gem for PG dump
Merge branch 'master' of github.com:fluxusfrequency/milehigh
Merge pull request #19 from benhorne44/capistrano

Add credentials for production db on server
Merge branch 'master' of github.com:fluxusfrequency/milehigh into reviews
Merge pull request #21 from benhorne44/master

Add review validations, fix migration naming errors
Merge branch 'master' of github.com:fluxusfrequency/milehigh
Started integrating newspaper theme
add store show and route through leafly engine and capybara feature test for store show page
added splash page to root
fix typo in splash title and add link to facebook login
fix bootstrap 2 and 3 merge conflict
Moves dummy app in Leafly engine to spec folder, and adds VCR tests for scraper
Merge branch 'staging' of github.com:fluxusfrequency/milehigh into reviews

Conflicts:
	db/schema.rb
pull from original staging
Merge branch 'staging' of github.com:fluxusfrequency/milehigh
added middle section of home page