CONTRIBUTING: Tweak style, language, etc.
corrected a merge conflict with mdbtools
Merge remote-tracking branch 'upstream/unstable'

Conflicts:
	packages/mdbtools/PKGBUILD
Merge remote-tracking branch 'upstream/unstable'
Merge remote-tracking branch 'upstream/unstable'
updated aesfix to work with blackarch
updated aeskeyfind to work with ba
Added scripts
Merge branch 'master' into unstable

Conflicts:
	CONTRIBUTING.md
scripts/arm: Make all executable.
scripts/arm: Make everything more idiomatic.
Remove 'scripts/arm/sumgen'.

We don't need this.
Remove 'scripts/arm/build'.

'make-repo' will take care of this.
updated airflood for ba
Minor PKGBUILD cleanup
Merge branch 'master' of https://github.com/izx64/blackarch into unstable
AUTHORS: Add elken.
Merge branch 'master' of https://github.com/archey/blackarch into unstable
checksec typo
mdbtools: Fix merge error.