fixed nullpointer error
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand
background color changed