All tests passing
Fixed conflicts
Merge pull request #33 from wvmitchell/creating_resturants

All tests passing