resolved merge conflict
edit
edit
Merge pull request #30 from PRADEEPPP/master

edit
qqq
qwe
Merge pull request #31 from ananthakrishnanprakash/master

yay
modified
modified
hhjf
Merge pull request #32 from monishamanoharan/master

edit
edits
fix
resolved merge conflict