Specificatie goal + field + puck + Ipowerup + bat
Merge remote-tracking branch 'origin/master'

Conflicts:
	PTS3DAirHockeyJA/src/AirHockey/Puck.java