bug fix commit in master
Merge branch 'master' of github.com:swati10/gitrepo into apygmailbranch
merge conflicts by apygmailbranch
commit for merge conflict
merge
merge conflict