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