Junk
Committing a single line
Merge branch 'master' of https://github.com/col/git_training

Conflicts:
	README.md