Added a second file
Updated file 1 (commondev)
change to file1 in lcDev
Merge branch 'commmonDev' into lcDev

Conflicts:
	file1.txt