changes
fixed merge conflicts
a few changes
fixed merge conflicts
finished static restaurant profile page
unfinished profile
fixed merge conflicts