conflict fixed
Merge branch 'unstable' of https://github.com/BlackArch/blackarch
Merge branch 'master' of https://github.com/nrzizrn/blackarch into unstable