quick commit to deploy to heroku
Merge branch 'master' of github.com:kylefdoherty/shoppin-site into emily
trying to fix heroku
still working on heroku errors
specifies ruby version to use for helper_method def
solr partially working, still much to be done
fixes merge conflicts