initial commit
Merge https://github.com/mamafanfan/notetest