-a
merged my (E) .aliases
commit
may2012
updated dotfiles
Merge branch 'master' of git://github.com/michaelcolenso/dotfiles

* 'master' of git://github.com/michaelcolenso/dotfiles:
  dotfile update

Conflicts:
	.gitconfig
aliases