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
Inventory changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	Export/KEYBOARD  QWERTY(Labels).pdf
	application/views/sections/link.php