created conflict
Merge branch 'master' into NIBG-123

Conflicts:
	test.txt
Merge branch 'master' into NIBG-123

Conflicts:
	test.txt
Merge branch 'master' of github.com:bogdan-dumitrescu/hairy-octo-avenger into NIBG-123

Conflicts:
	test.txt
Merge pull request #2 from bogdan-dumitrescu/NIBG-123

created conflict