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

Conflicts:
	app.js
Merge branch 'master' of https://github.com/040-Internet/040BookTimes
DB connection and port
Merge branch 'master' of https://github.com/040-Internet/040BookTimes
Merge branch 'master' of https://github.com/040-Internet/040BookTimes
Småsaker
Merge branch 'master' of https://github.com/040-Internet/040BookTimes

Conflicts:
	app.js
	public/js/index.js
	routes/mainpage.js
Merge branch 'master' of https://github.com/040-Internet/040BookTimes
Merge branch 'master' of https://github.com/040-Internet/040BookTimes
Merge branch 'master' of https://github.com/040-Internet/040BookTimes
Fixes times > 24 h