changed to bala
Conflicts:
	bala.php
Merge branch 'master' of git@github.com:jaithylak/IMS.git

Conflicts:
	bala123.php