index file modified
resolved merge conflict
Merge branch 'master' of https://github.com/gireeshcse/testgit into team1

Finally team2 has completed the coding now its is time to release the version 2 by merging the codes
feel free raise the issues
changed the index
merge conflict solved