dotfiles-valentine commit for Tue Jul  1 06:32:42 MDT 2014
dotfiles-valentine commit for Tue Jul  1 06:34:58 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.xmonad/xmonad.hs