working on bugs
resolved bugs
add common files
resolved conflicts
Merge pull request #80 from priyanka-techmaes/bugs-develop

Bugs develop