updated file1
added line3 for file2
merged story2 with master