Revert "Revert "Merge branch 'master' of https://github.com/S33C-PTS3/PTS3""

This reverts commit a1e87559bd3d6983e83d513004bebb2d251274d0, reversing
changes made to 37dec1e5bae3b1dde142fd54ecada37cf0f89b20.

Conflicts:
	AirHockey Game/build/built-jar.properties
	AirHockey Game/dist/AirHockey Game.html
	AirHockey Game/dist/AirHockey Game.jar
	AirHockey Game/dist/AirHockey Game.jnlp
	AirHockey Game/dist/web-files/dtjava.js
	AirHockey Game/nbproject/build-impl.xml
	AirHockey Game/nbproject/private/private.properties
	AirHockey Game/test/HockeyFieldTesting.java