shop controller spec
auth helper
merginc conflicts
Merge pull request #6 from bbttxu/shops

Shops