excluding html and gif files
on branch experimental modified 1.txt
n branch master modifies 1.txt to say that master rules
Merge branch 'experimental'

Conflicts:
	1.txt