task#5 vi du de bi conflict
them vao trong task#6
Merge branch 'task#6'

Conflicts:
	hello.text