cateogory relation
Merge branch 'master' of github.com:HumbleLivelyBear2/restaurant_server

Conflicts:
	config/routes.rb