Added lines
Merge branch 'branch2' of github.com:derek121/test into branch2

Conflicts:
	dir/file