Fixing conflicts of rebase
Implements merchants CRUD functions
Implements CRUD of deals for a specific merchant
Merge pull request #2 from davidmansy/feature

Implements the merchants crud and the deal merchants crud functions