initial commit
Merge https://github.com/rose4jyoti/dev