fixed a bug
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand
optionsSene
solved conflct