test commit
Merge branch 'master' of github.com:Yuras/diff-lexer

Conflicts:
	.project-settings.yml