Revert "Merge"

Reverts Isoterik/anarchie#1