test commit
prepare to merge
Merge branch 'master' of https://github.com/generall/text_patterns

Conflicts:
	src/patterns.cpp