to resolve the confilcts
Merge branch 'master' of https://github.com/aruntomar/myshala
edited pub file
edited gathering file
edited gathering.doc file in aim branch
Merge branch 'master' of https://github.com/aruntomar/myshala into aim
changed aaditi file
testing branch commit
Merge branch 'aim'
Merge branch 'testing'
Merge branch 'master' of https://github.com/aruntomar/myshala