add local
Merge branch 'master' of github.com:nbirnel/dotfiles

Conflicts:
	.Xdefaults
add openbsd to .bashrc