first b commit
Merge branch 'master' of github.com:regedor/diff_bug

Conflicts:
	file