Animated attractor/repulsor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/nl/sest/gamejam/model/player/PlayerAttractor.java
	src/main/java/nl/sest/gamejam/model/player/PlayerRepulsor.java
	src/main/java/nl/sest/gamejam/view/ViewGame.java
Animated attractor/repulsor