Add 20
Merge branch 'master' of https://github.com/hungndv/Test

Conflicts:
	file.txt