Merge branch 'master' of https://github.com/felics/.htyes

Conflicts:
	.gitignore
Code-Cleanup