Merge branch 'master' of D:\xampp\htdocs\tournament with conflicts.
merge changes + dump updated db