change 1
Merge branch 'master' of https://github.com/vinhsoft/Insurance

Conflicts:
	test.txt