before merge
Merge branch 'master' of https://github.com/Gregory14/impala

Conflicts:
	impala-web/stylesheets/screen.css
Inscription d'un nouveau user