did some messing around
Merge branch 'master' of http://github.com/LinneaAndersson/SecondHand