Checking in file without taking latest
merge conflicts resolved
Merge pull request #5 from jassharma/branch1

Branch1