Another test

Merging a file that has been changed in the repo and locally.
Merge branch 'master' of https://github.com/Carmol/Picture-Mover