Merge branch 'master' of https://github.com/naokosaka/NKColorSwitch

Conflicts:
	README.md
Fix comit conflict