Konflikt
Merge branch 'anti-master' of https://github.com/Deadman44/w into anti-master