stuff
Merge branch 'master' of github.com:lbolla/dotfiles

Conflicts:
	.ghc/ghci.conf