template welcome message percentage resetting
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
	application/views/template.php
	assets/viral_load.json