restaurant logo upload
merge conflict
Merge branch 'master' of https://github.com/sbroadfoot90/wmc