modify2
Merge branch 'branch2' into branch1

Conflicts:
	new.txt
theme
3themes