がんばっていこう？
Merge branch 'master' of https://github.com/syupein/test_kdfes.git

Conflicts:
	test.html
Merge branch 'master' of https://github.com/syupein/test_kdfes.git