scorefix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/be/howest/groep5/breakout/model/game/Ball.java
scorefix