Branch_delete
Course_Display
Course_Insert
course_Delete
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
Merge remote branch 'upstream/master'
Course
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/admin.php
	application/controllers/branch_manager.php
	application/models/branch_model.php
	application/views/backend/branch_manager/branch.php
frontend
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/models/course_model.php
	application/views/backend/branch_manager/branch.php