Commit from parent branch
Commit from child branch
Merge branch 'master' into ad-child

Conflicts:
	Foobar.txt
Merge pull request #1 from Apex-net/ad-child

Ad child