a
Merge branch 'master' of https://github.com/lephuongbac/gitdemo.git

Conflicts:
	OracleCloudDemo/newfile.txt