Restaurant search added
Merge conflict fixed
Fixed Compile Errors