Merge branch 'master' of https://github.com/blocklistproject/Lists

diff --cc abuse.txt
Simple merge

diff --cc ads.txt
Simple merge

diff --cc malware.txt
Simple merge

diff --cc phishing.txt
Simple merge