Update a.txt
issue05 change1
Merge branch 'master' into wip/bradtm2000/test

Conflicts:
	a.txt