Changes
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	application/views/template.php