confl1
confl2
Merge branch 'qs'

Conflicts:
	index.txt
Merge branch 'br1'