worked with comments
fixing conflict in html
fixed conflict
fixed js error
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into devbranch

Pulling recent