Fix Display scores
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Game.java
Merge branch 'master' of https://github.com/andreykata/TEAM-CRANBERRY

Conflicts:
	src/Game.java