background and Enemy animations
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/Game.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 4c69f27c67897ed27ac3fdc481cb0c0ef3ea9af7.