ff
Merge branch 'ansal' of https://github.com/Trions/Bhavans into ansal

Conflicts:
	application/controllers/coordinator.php
	application/controllers/coordinator.php~
	application/controllers/teacher.php
	application/controllers/teacher.php~
	application/models/model_coordinator.php
	application/models/model_coordinator.php~
	application/models/model_teacher.php
	application/models/model_teacher.php~
	application/views/crdinator/add_stu.php
	application/views/crdinator/add_stu.php~
	application/views/crdinator/add_teacher.php
	application/views/crdinator/add_teacher.php~
	application/views/crdinator/list_student.php
	application/views/crdinator/list_student.php~
	application/views/crdinator/list_teacher.php
	application/views/crdinator/list_teacher.php~
	application/views/teacher/add_evaluation.php
	application/views/teacher/add_evaluation.php~