made merchant model
made merchant and home views
Merge pull request #2 from brigid2718/merchant

Merchant