Merge branch 'master' of github.com:Cockatrice/Cockatrice
removals
changes
fixes
fixes