Making slight changes for user based directories
Merge branch 'DEV' of https://github.com/hasnain110/cloud-store into DEV