resize "hello" message (42sp)
Merge branch 't1'

Conflicts:
	hellow/src/main/res/layout/activity_main.xml