Theme name change
name change b
name change c
Merge branch 'branch-a'

Conflicts:
	style.css