fix
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand

Conflicts:
	Twist/src/com/secondhand/controller/GamePlaySceneController.java