Adding class to test branch
strange commit
Merge branch 'testbranch'

Conflicts:
	src/classes/Test1.cls-meta.xml