updated
Merge branch 'master' of github.com:KentaYamada/KntLibrary

Conflicts:
	.gitignore