Header alteration
Merge remote-tracking branch 'origin/master'

Conflicts:
	PTS3DAirHockeyJA/src/AirHockey/Player.java