edit d.txt kkkkkkkkkk
Merge branch 'master' of github.com:twopiece/sitcon

Conflicts:
	d.txt