add cd cd
add a a
Merge branch 'cd'

Conflicts:
	a
ignore