Test 2
Merge branch 'master' of https://github.com/luciferlu/git-kw-filter

Conflicts:
	test.sql