add file 1

Added a text file called file1
first experimental commit

This was the first experimental commit
changed file1

Now file 1 says master
Merge branch 'experimental'

Conflicts:
	file1.txt