dotfiles/valentine commit for Fri Nov 14 11:15:26 MST 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.Xresources