edit ef
cd
add master/master
add cd/cd
Merge branch 'cd'

Conflicts:
	a.php
add gitgignore