Edited Note and NoteCtrl angular files
Fixed conflict file blocknote.js
Merge pull request #16 from albertodotcom/alberto

add codemirror gem and textangular
note and noteCtrl angular files are completed
Merge pull request #17 from albertodotcom/pranava

note and noteCtrl angular files are completed
Merge branch 'master' into alberto