Parameterized queries
Merge branch 'master' of https://github.com/040-Internet/040BookTimes

Conflicts:
	routes/mainpage.js