edited
edited
edited
edited
edited
edited
Merge branch 'master' of github.com:gyveryeoh/anesthesiology

Conflicts:
	application/config/database.php
	application/controllers/reports_controller.php
	application/controllers/users_controller.php
	application/views/header/reports_header.php
Merge branch 'master' of github.com:gyveryeoh/anesthesiology
nakalagay na yung total hours sa reports controler
may binura lang na extra codes.
binalik ko yung mga denelete..nag error..
Merge branch 'master' of github.com:gyveryeoh/anesthesiology

Conflicts:
	application/controllers/reports_controller.php
	application/models/reports/reports_model.php
	application/views/reports/total_anesthesia_hours.php
hospitals/services added
hospital/service added
Merge branch 'master' of github.com:gyveryeoh/anesthesiology