changes d
changes
Merge branch 'master' of https://github.com/kivling/testing

Conflicts:
	a.txt