some changes
Merge branch 'master' of https://github.com/gondars/Java

Conflicts:
	Team-Project-Pong/src/Ball.java
	Team-Project-Pong/src/Game.java
	Team-Project-Pong/src/InputHandler.java