Anand Borkar

Please review and merge

Also please add hacktoberfest tag to this issue

I have resolved the conflicts