Finals rules
database
Merge branch 'master' of https://github.com/NiceMarket/BasketballClub

Conflicts:
	controllers/database.js
	views/club.ejs