resolving conflicts
Merge branch 'master' of https://github.com/optodent/Ping_Pong

Conflicts:
	bin/Game.class
	src/Game.java
Merge branch 'master' of https://github.com/optodent/Ping_Pong

Conflicts:
	bin/Game.class
	src/Game.java