ghj

ghjg
h

h
Merge branch 'master' of https://github.com/Silendel/Nuit-de-l-Info

Conflicts:
	app/config/databaseConfig.php
	controller/SearchController.php