changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

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

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

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

Conflicts:
	application/controllers/patient_management.php
	application/views/template.php
	assets/sql.txt