Affichage de l'aperçu amélioré
Merge
Merge
Merge branch 'master' of https://github.com/mcdooda/hairy-wookie

Conflicts:
	css/login.css