commiting
fixed merge
Merge branch 'master' of github.com:chelseakomlo/StoreEngine
factories for users and products created.
added another product to factory girl
building factories
fixed login issue in order controller spec
all green