test question 5
Merge branch 'master' of https://github.com/livilynx/siteWeb

Conflicts:
	questionneur/lib/db.js