TODO: Tweak the format.
Merge branch 'master' of https://github.com/BlackArch/blackarch

Conflicts:
	docs/TODO