merge test

nothing
Merge remote-tracking branch 'origin/Skeletons' into Skeletons

Conflicts:
	GameTest/core/src/com/mygdx/game/FortuneCard.java