test
icon
change setting
Merge branch 'master' of https://github.com/itoshima/itoshima.github.com

Conflicts:
	js/setting.js