Added another line.
Merge branch 'HEAD' of git@github.com:lairdshaw/try_git.git

Conflicts:
	test/test.txt
Added another line.