Fix color in ls
Add git merge.log=true
Merge branch 'master' of github.com:pb30/dotfiles

# By Drew Brown (1) and pb30 (1)
# Via Drew Brown (1) and pb30 (1)
* 'master' of github.com:pb30/dotfiles:
  Added color to ls aliases
  Update README

Conflicts:
	aliases