wtf changes
Merge branch 'master' of http://github.com/baabelfish/dotfiles

Conflicts:
	.xinitrc
	README.md
Merge branch 'master' of http://github.com/baabelfish/dotfiles