fixing new note and folder bug
fixed new buttons bug
updated package.json
returning to master branch