Merge branch 'master' of https://github.com/archey/blackarch into 0trace
Merge branch '0trace'