Merge branch 'master' of https://github.com/gameDevPrep/PaddleGame

Conflicts:
	bin/dev/game/project/PaddleGame.class
	src/dev/game/project/PaddleGame.java
Merge branch 'master' of https://github.com/gameDevPrep/PaddleGame

Conflicts:
	src/dev/game/project/PaddleGame.java