merging...
we are merging in some other changes...
Merge branch 'master' of https://github.com/joker23/Notes
delete and add are now working... with some cool grpahical things