Got testing working, added more test cases
Updated editing of notes
updated editing
working on commenting
fixed merge