initial files
add Brewfile
fix Brewfile
fix git branch detection
Merge branch 'master' of github.com:michalochman/dotfiles

Conflicts:
	.bash_profile
	Brewfile
update gitconfig