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

Conflicts:
	CSS/style.css
	application/views/login_v.php
	application/views/sections/head.php
	application/views/template.php