stock transactions
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/controllers/inventory_management.php
	application/views/change_password_v.php
	application/views/sections/link.php
changes 29th
changes
changes
changes
30th may changes
Inventory changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	Export/KEYBOARD  QWERTY(Labels).pdf
	application/views/sections/link.php
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/views/sections/link.php
Reports changes
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/config/database.php
	application/views/dispense_v.php
	application/views/sections/link.php
Reports changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
Latest changes
latest
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/config/database.php
	application/controllers/patient_management.php
	application/views/dispense_v.php
	application/views/sections/link.php