first change by user2
Merge branch 'master' of github.com:dardenfall/git_tests

Conflicts:
	file1.txt