admin details
conflict solved
Merge pull request #3 from emocentmagar/lalit

Lalit