First Commit in branch
Modified the code
Bug_fix
new bug fix
Merge branch 'master' of github.com:PrabhakarAlld/GitAssignment
master bug fixed
resolve conflict