fixed nokogiri version in gemfile
Merge branch 'master' of https://github.com/BaobabHealthTrust/National_ART_EMR_System