Added file2
Merge branch 'addfile2'