Minor fix
Update PKGBUILD
Update batman-adv.install
Adding new package.
Merge pull request #1 from izx64/master

Minor fix
Merge branch 'unstable' of https://github.com/adminempire/blackarchlinux into unstable
Merge branch 'master' of https://github.com/adminempire/blackarchlinux into unstable

Conflicts:
	packages/batman-adv/PKGBUILD
	packages/batman-adv/batman-adv.install