ignore
haskell mode
Merge branch 'master' of github.com:tubo028/dot-emacs

Conflicts:
	.gitignore