modif
Merge branch 'master' of
https://github.com/lemaireAlexandrePro/CandyCrushMD.git

Conflicts:
	CandyCrushMD/Database.bd
	CandyCrushMD/src/tests/TestDao.java