adding first part of assignment1
Adding in a few tests for the server
Fixing the server code & adding deletion of bookmarks
adding first part of assignment1
Adding in a few tests for the server
Fixing the server code & adding deletion of bookmarks
Fixing some conflicts
Merge pull request #5 from eccarmichael/assignment1

Assignment1