comments
Merge branch 'master' of github.com:q41/apc

Conflicts:
	BallAndPaddle Base/src/bp/base/CollisionEffect.java
	BallAndPaddle Base/src/bp/base/Effect.java
	BallAndPaddle Base/src/bp/base/GeneralEffect.java
	BallAndPaddle Base/src/bp/base/Level.java
	BallAndPaddle Base/src/bp/base/collision/CollisionResolver.java