Signed-off-by: WinSir <wenrongjing@live.com>
Signed-off-by: WinSir <wenrongjing@live.com>
Merge branch 'master' of git://github.com/WinSir/WinSir.Tools.Photos

Conflicts:
	.gitignore