smapklr
smaple
Merge branch 'home_1'

Conflicts:
	file1