ott push
Merge branch 'master' of https://github.com/Sja91/sjaTestRepo

Conflicts:
	test.txt