resolving conflicts
added logo to stock report
modified layout and rescued 0 to avoid division by zero error
resolved conflicts
modified the viral load popup to show when the next task is HIV consultation or hiv staging
Merge branch 'master' of github.com:BaobabHealthTrust/bart2