Add some few changes.

Add a new test file named 'file4', and insert into it a test line.

	new file:   file4
Add some few changes.

Insert a new test line.

	modified:   file3
Merge branch 'test'

Conflicts:
	file4
Add a new *test line*.

	modified:   file2
Merge remote branch 'origin/master'