solving red arrows
Merge branch 'master' of http://github.com/LinneaAndersson/SecondHand

Conflicts:
	Twist/src/com/secondhand/model/powerup/PowerUpFactory.java
conflict fix