bad change
committing a merge
Merge branch 'master' of https://github.com/msartintarm/bashers3

Conflicts:
	test.txt