Merge branch 'master' of https://github.com/RufusMbugua/mnh into develop
Merge branch 'hotfix/3.2.0'
Section 5 of CH now should be posting
challenge have good binomial nomenclature
Merge branch 'develop' of https://github.com/cheriuyot/mnh into develop
MNH
Testing
Offline Forms
Commiting
supply statistics only working in m_analytics
Story za supply location graph is displaying a pie but looks like its going to be a weird one. Please check someone
Problems with pushing and pulling
Merge branch 'develop' of https://github.com/WillyMareka/mnh into develop

Conflicts:
	application/controllers/c_analytics.php
	application/models/m_analytics.php
Si i got problems with github. Whole function disappeared. Now try this one. Supply location graph
Tried to add commodity location graphs. Displaying but not right
supplies_location
commodityLocation should work
Both ch mnh commodity $ supplies
resource location
Equipment Statistics now a pie
Merge branch 'develop' of https://github.com/WillyMareka/mnh into develop

# By Willy Mareka (12) and nwaweru (1)
# Via Willy Mareka (3) and others
* 'develop' of https://github.com/WillyMareka/mnh:
  Equipment Statistics now a pie
  resource location
  Both ch mnh commodity $ supplies
  commodityLocation should work
  supplies_location
  Tried to add commodity location graphs. Displaying but not right
  Si i got problems with github. Whole function disappeared. Now try this one. Supply location graph
  Problems with pushing and pulling
  Story za supply location graph is displaying a pie but looks like its going to be a weird one. Please check someone
  Commiting
  MNH Testing Offline Forms
  challenge have good binomial nomenclature
  Section 5 of CH now should be posting

Conflicts:
	application/controllers/c_analytics.php
	application/core/MY_Controller.php
Fixing After Merges