metallica
Merge branch 'master' into b1

Conflicts:
	file - just appending conflicted content...