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

Conflicts:
	CandyCrushMD/src/model/User.java