first forked commit
conflict commit
Merge branch 'master' of github.com:stevenjoneses/git_practice

Conflicts:
	test_file