Adds homebrew to path
Merge branch 'master' of github.com:marcja/.bash

Conflicts:
	bashrc