initial commit
Merge https://github.com/VijayKumarYadav/FlikrTest