login page created
Target and Event
Batch Timing Added
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Login method add
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution into mohit0202-master
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/branch_manager.php
checking date
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
abc
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution

Conflicts:
	application/controllers/branch_manager.php
Branch_Display
Merge pull request #12 from Dragonn11/master

change merge done
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/branch_manager.php
	application/models/branch_model.php
Merge remote branch 'upstream/master'
Validation added in batch file.
Configuration changed
time picker add.
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/views/backend/branch_manager/batch.php
Delete Batch.php
changes in batch