Test class in config.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/config.yml
Test class in config.yml