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