conflict fix
Merge branch 'master' of https://github.com/pedrogusman/Manager.git
restaurants page fix