added new changes
conflit resolved2
Merge pull request #4 from ksgowripriyanka/feature/mainView

Feature/main view