Update Commit
Merge branch 'master' of https://github.com/manoj2589/Team-B into b1
Update Commit1
Commited new
Resolved a conflict created.