Merge pull request #12 from wgallop99/master

please fix us nick
Merge pull request #13 from wgallop99/master

removed coffee
added json routes to restaurants controller and began menus controller
Merge pull request #14 from mwdion/master

added json routes to restaurants controller and began menus controller
Merge pull request #15 from wgallop99/master

fixing errors
Merge pull request #16 from wgallop99/master

fixed html
item controller
finished json routes with Menu controller and edited restaurant controller
Merge pull request #18 from wgallop99/master

fixed bugs, content shows
Merge pull request #17 from alehrhardt4/master

item controller
fixed routes, added bg image
Merge pull request #19 from mwdion/master

finished json routes with Menu controller
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team6
Merge pull request #20 from lapty/master

added image
fixed variable error, angular now works