complete works
Merge pull request #12 from whoisglover/models

complete works
updating controller
Merge branch 'master' into menu_madness