new note
new note, root dns redirect
Merge branch 'dev'