Create newFileInDEV.txt
Create newFileInDEV1.txt
new empty file in dev repo
Merge remote-tracking branch 'origin/dev' into canFea
changes from canFea