added some instructions
merged files