stalking feature added
jade merge conflict resolved
Merge pull request #23 from shrutijalewar/backend-setup

stalking feature added