Merge pull request #21 from shrutijalewar/backend-setup

shanked feature 1.0 working
stalking feature added