Merge pull request #34 from jgat2012/master

Order:Importing
merged with abdala
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
	assets/viral_load.json