new font color
Merge branch 'master' of https://github.com/rikiin097/test

Conflicts:
	test.css
yes
image included