Old commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	CandyCrush/src/controler/GameControler.java
	CandyCrush/src/main/Run.java