Student Result
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/student.php
Show attendance Complete
Display Marks Complete
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/models/test_result_model.php