changed bala again
Resolved conflicts
Changed bala.txt
Sibi

Sibi
sibi

sibi
Merge conflict resolved
sibi
sibi1Merge branch 'master' of github.com:srmanikandasriram/robocon-git-fundaes

Conflicts:
	shahidh.txt~
Resolved conflict in bala
Merge branch 'master' of github.com:srmanikandasriram/robocon-git-fundaes

Conflicts:
	bala.txt
Merge branch 'master' of github.com:srmanikandasriram/robocon-git-fundaes into rahul