Ignore tramp file
Merge branch 'master' of github.com:laynor/emacs-conf

Conflicts:
	.gitignore