HW5, added show/edit/delete to users and notes, found in the view all pages, updated README
Fixing branch merges in README file