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
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
change
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution

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

change merge done
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
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/views/backend/branch_manager/batch.php
Batch js updated
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
Commite for delete
Batch file added.
Marks.php updated
Test & marks design added
minor chang in test.php