Commit for bob
Merge branch 'master' of https://github.com/marktheshark/try_git3

Conflicts:
	start_file.txt