created view
merge resolve in routes
progress in restaurants page
removed construction, merge conf
restaurants skeleton page
Merge branch 'master' of github.com:johnnyg12791/spork
singular models