Finished
Merge branches 'master' and 'master' of https://github.com/Gisonrg/To-Do-s

Conflicts:
	model/db.php
leaderboard fixed