Merge origin/master

Conflicts:
	AirHockey/src/components/Viewer.java