removed line caused by conflict
modified the css
changed colours on viral load popup
changed date format on viral load popup
resoved conflict
resoved conflict
fixing bugs: patient's dashboard was showing wrong appointment dates
working on ART workflow
recreated this file as it was missing
fixed tb visit workflow
fixed conflicts
removed popup for tb regimen
worked on guardian redirection
replaced gemfile
resolved conflicts in Gemfile
merging - resolving conflicts + fixing bugs
Merge branch 'bart2'
Merge branch 'master' of github.com:BaobabHealthTrust/bart2