Changes from UBUNTU
Changes from UBUNTU
Merge branch 'master' of github.com:Mdleal/Scripts

Conflicts:
	pfsense/pingtest.sh