pwd
relolve confict on photos.py

Merge branch 'master' of https://github.com/andyxmas/photopi

Conflicts:
	photos.py