demo 5
Merge branch 'master' of https://github.com/voanhvu/projectdemogit

Conflicts:
	file_com.txt