Merge pull request #2 from davidmansy/feature

Implements the merchants crud and the deal merchants crud functions
fixed merge issues
fixed merge conflict
Ability to add a picture to a deal and save the picture in firebase