session and some changes
Merge branch 'master' of https://github.com/anjani-phuyal/project2

Conflict merge