updated note and note parser
resolve conflicts
Merge pull request #11 from javiersuweijie/natalie

Natalie