basic capybara tests for text on landing page
Merge pull request #14 from benhorne44/facebook_auth

setup omni auth and include koala gem for facebook
remove ds store
fix merge conflict
add gemfile name to rvmrc
leafly API in rolling paper with rspec test
moved rolling_paper gem out of directory
Merge pull request #17 from BryanaKnight/rolling_paper

Rolling paper
generated leafly engine
built scraper
finish scraper
wrote store class to scrape stores from leafly and save to db
add leafly to main app and rename bad migration
ran migrations to update users
Merge branch 'leafly_engine'
Merge branch 'master' of github.com:fluxusfrequency/milehigh into capistrano

Conflicts:
	Gemfile
Allows access to database on server