my first commit
updated the file for merging
merged