merge
Merge remote-tracking branch 'origin/master'
added sorting of notes
equipment - changed from 5 photo to 1