fixed ch guidelines
changes after setting up my localhost
change data
working on other totals
Merge branch 'mnch' of https://github.com/cheriuyot/essential into mnch

Conflicts:
	application/config/database.php
	application/core/MY_Model.php
	application/modules/analytics/controllers/analytics.php
	application/modules/analytics/models/analytics_model.php
	application/modules/survey/controllers/form_handler.php
	application/modules/survey/controllers/generate.php
	application/modules/survey/models/m_complete_survey.php
	application/modules/template/views/mnh/analytics/content_visual_charts_commodity_availability.php
	application/modules/template/views/mnh/pages/v_login.php
	assets/javascripts/analytics.js
	assets/javascripts/survey.js
	dbv/data/schema/bemonc_functions.sql
	dbv/data/schema/challenges.sql
	dbv/data/schema/commodities.sql
	dbv/data/schema/commodity_outage_options.sql
	dbv/data/schema/community_strategies.sql
Merge branch 'mnch' of https://github.com/cheriuyot/essential into mnch

Conflicts:
	application/modules/analytics/models/analytics_model.php
	application/modules/survey/controllers/survey.php
problems after pulling
#Willy* and Emmy's work
Merge branch 'mnch' of https://github.com/WillyMareka/essential into mnch

Conflicts:
	application/core/MY_Model.php
	application/modules/analytics/controllers/analytics.php
	application/modules/analytics/models/analytics_model.php
	application/modules/survey/controllers/form_handler.php
	application/modules/survey/controllers/generate.php
	application/modules/survey/controllers/survey.php
	application/modules/survey/models/m_complete_survey.php
	application/modules/template/views/mnh/analytics/content_visual_charts_commodity_availability.php
	application/modules/template/views/mnh/pages/v_login.php
	assets/javascripts/analytics.js
	assets/javascripts/survey.js
fixed all ch graphs
fixed all graphs in ch...
Merge commit 'a3cfd73bfed208f4a929d7bce410a07f72e79f64' into mnch
Merge commit 'd7c78e4c181de6ec393cb00504115123275da702' into mnch

Conflicts:
	application/core/MY_Model.php
Merge commit '4057f07068f713312e7af51f92305f009485bf35' into mnch

Conflicts:
	application/modules/analytics/controllers/analytics.php
	application/modules/analytics/models/analytics_model.php