more stylin
resolve merge conflict
damn you css
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/project_86
multi-party menus
some more tweaks
Merge pull request #30 from jgkingston/master

Added multi-part menus and did some stylin' to the restaurant and menu views