tralala
Merge branch 'master' of https://github.com/lordzurp/BSD_Install

Conflicts:
	boot/loader.conf