test
niacnMerge branch 'master' of https://github.com/ThangnvOlbius/testGitIgnore

Conflicts:
	config.xml
change config