Add d e f
Merge branch 'master' of https://github.com/fok8/test1

Conflicts:
	index.html