edited by tester
Merge branch 'feature-two' of https://github.com/ingineering/sputnik into ingineering-feature-two

Conflicts:
	bar.txt