Reset puck on score
Fixed merge conflicts

Conflicts:
	Airhockey/src/controllers/GameManager.java
	Airhockey/src/game/GameWorld.java
	Airhockey/src/game/Puck.java