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

Conflicts:
	assets/viral_load.json
Merge branch 'master' of https://github.com/KevinMarete/ADT
CM use crypto-coccal meningitis in other illnesses not from indications