Added join table for menu items and orders
Merge conflicts
handled conflict
handled conflicts
Merge pull request #13 from kheang/master

Added join table for menu items and orders