merged feature file related to user
Merge pull request #516 from Pranjalita/merging_feature_files_related_to_Users

merged feature file related to user    story #1820