Merge pull request #22 from alehrhardt4/master

removed restaurant and corrected menu model
changed the item json routes again
Merge pull request #23 from mwdion/master

changed the item json routes again
added new routes
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team6
testing ngular
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team6
Merge pull request #24 from wgallop99/master

added routes
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team6
added admin/view buttons
Merge pull request #25 from lapty/master

added user/admin buttons
removed restaurants crud on service and controller
fixed conflict
Merge pull request #26 from wgallop99/master

removed restauarant crud
added the devise user login helper
merge error correction
Merge pull request #27 from mwdion/master

added the devise user login helper
added pictures to individual rests
adding json formatter
added filter back on, made local collection of restaurants