fix
Merge branch 'master' of https://github.com/yellowtrolley/photodb.git

Conflicts:
	.gitignore