adding line from gitbash
Merge branch 'master' of https://github.com/luketmoss/test_repo

Conflicts:
	test_file2