lägger till usr partial mm.
konflikter till max
Merge branch 'master' of https://github.com/recksen/bastis