merge
Merge branch 'master' of https://github.com/fox11trot/du-snap

Conflicts:
	log