copy pic to my pictures
copy_files.log to file
Merge branch 'master' of github.com:zfbp/env

Conflicts:
	.gitignore