Edited masterFile.txt in dev3.0
merged 2 and 3 to dev1