index on master: 997b1b0 resolved a few more merge conflicts
WIP on master: 997b1b0 resolved a few more merge conflicts
Added editing+deleting to feedback and finished feedback styling, fixed a few problems. Still need to fix bug with JS registration form