s is to check
Update t.txt
this: is biju sir change
Merge branch 'nov' of https://github.com/studentpra/gitsetup into nov

Conflicts:
	t.txt
Merge pull request #2 from studentpra/master

check merging