CONNECTION DECONNECTION MOTHERFUCKERS
Je sais pas commiter
Merge branch 'master' of https://github.com/chriscx/DeLaLicorne

Conflicts:
	application/views/header.php
	application/views/main.php