premier depot, des changements déjà efectues
ajout formulaire inscription mais qui ne fait rien
mail activation désactivé. homepage.php créée
Merge branch 'master' of github.com:Fatine/GestionDeNotes

Conflicts:
	CodeIgniter_FILES/application/config/autoload.php
	CodeIgniter_FILES/application/config/config.php
	CodeIgniter_FILES/application/config/database.php
	CodeIgniter_FILES/application/config/routes.php
	CodeIgniter_FILES/application/controllers/connexion.php
	CodeIgniter_FILES/application/views/connexion.php
	CodeIgniter_FILES/application/views/inscription.php
	CodeIgniter_FILES/index.php
	GestionDeNotes/CodeIgniter_FILES/application/config/custom_config/profile_switcher.php
	GestionDeNotes/CodeIgniter_FILES/application/config/database.php
	GestionDeNotes/CodeIgniter_FILES/application/config/routes.php
	GestionDeNotes/CodeIgniter_FILES/application/config/tank_auth.php
	GestionDeNotes/CodeIgniter_FILES/application/controllers/auth.php
	GestionDeNotes/CodeIgniter_FILES/application/views/auth/login_form.php