misc again
Merge branch 'master' of https://github.com/WiJeBe/Arkardmaskin