changed ctrls, added individual folders for each restaurant
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team6
waiting for merge
merged conflict
styling husk page
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team6
Merge pull request #48 from lapty/master

asdfasdf