flower and merchant controllers now tested
Merge pull request #7 from githop/rspec

flower and merchant controllers now tested