Resolve conflict
Merge branch 'master' of https://github.com/plovesm/PicSorter.git