added cmment
removed s
added a's
conflict removed
Merge pull request #1 from sneha-bharti/master

hi pull