First commit
Merge branch 'Branch1' of github.com:HaiConvertDigital/17-06_14 into Branch1

Conflicts:
	This is the first file.txt