database
ADT-Nascop Link
Carabiner now fixed and in effect
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	assets/cache/13763829378b2db8a989fca9d7a2b48449da4f7073.jstt