working on view-model
working with conflicts, now we cant play.
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand