updated to file2
merged
Merge branch 'master' of https://github.com/anuragkapur/GIT-Play