add local commit
Merge branch 'master' of github.com:Rafe/trygit

Conflicts:
	test2.txt