add rails_12factor gem
add splash template
Merge pull request #19 from benhorne44/capistrano

Add credentials for production db on server
Merge branch 'master' of github.com:fluxusfrequency/milehigh into reviews
Started integrating newspaper theme
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