test
Merge branch 'master' of https://github.com/mruckman/git-training

Conflicts:
	one.txt