new editing
Merge remote branch 'remotes/origin/master'
Merge remote branch 'remotes/origin/master'
new editing, new jpg files