Blacklist/Whitelist-Update
Merge branch 'master' of github.com:dcell/satori