working full text pg-search
changing merge conflicts
working pg_search and faker to populate
add shopping cart
stupid gemfile.lock
Merge branch 'master' of https://github.com/danarch/iron-shop
merged after new cart table
specs working after adding carts table
Merge pull request #7 from danarch/ElasticSearch

Pg search included