Routine
Merge branch 'master' of https://github.com/cheriuyot/mnh
Analytics
Merge branch 'master' of https://github.com/cheriuyot/mnh

Conflicts:
	application/controllers/c_analytics.php
changes
Merge branch 'master' of https://github.com/RufusMbugua/mnh

Conflicts:
	application/controllers/c_analytics.php
	application/views/analyseChallenges.php