fixed merge conflicts
update merge conflicts
working customer signup
update customer controller
added customer and restaurant signin
updated restaurant routes