add basic note functionality
add user name to note
fix merge conflicts
Merge branch 'master' of https://github.com/tiger-swallowtails-2013/enlytify