dotfiles-comet commit for Mon Jun 30 03:39:09 MDT 2014
dotfiles-comet commit for Tue Jul  1 00:43:12 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.xmonad/xmonad.hs