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
Test module changes
Target Reports Merge
Merge pull request #39 from vaishali91/master

Send Notification views changed and model added
Teat module changes
Book Inventory Update done
Merge pull request #40 from Dragonn11/master

Test module
Student Course Register
Merge pull request #41 from mohit0202/master

Student Course Register
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/models/course_model.php
	application/views/backend/branch_manager/branch.php
Errors in course_model
Complete Registration