sorting notes
Merge branch 'paulo'