a test commit message
aswdfasfd
Merge branch 'master' of github.com:shearer12345/try_git

Conflicts:
	octocat.txt