assets
sets to true
production.rb changes
moves rails12_factor gem
more
Merge branch 'staging' of github.com:fluxusfrequency/milehigh
created user profile test
Merge branch 'remove_engine' of github.com:fluxusfrequency/milehigh into remove_engine
finished adding user details to user page
fixed adding a review to a store
Merge branch 'staging' of github.com:fluxusfrequency/milehigh into remove_engine
Merge branch 'staging' of github.com:fluxusfrequency/milehigh into remove_engine
unskip and pass review validation tests
fixes creating a positive review for a store
Merge branch 'tests' of github.com:fluxusfrequency/milehigh into remove_engine

Conflicts:
	Gemfile
	Guardfile
	config/routes.rb
	spec/features/review_store_spec.rb
	spec/features/search_spec.rb
Fixes scraper test.
Merge branch 'staging' of github.com:fluxusfrequency/milehigh into staging

Conflicts:
	Gemfile
Merge branch 'remove_engine' into staging
again
moved assets line to production.rb