changes 29th
changes
Latest changes
Updated with merging
30th may changes
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

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

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