fix indent
add Brewfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vim/userautoload/indent.vim