added tramp to .gitignore
Merge branch 'master' of github.com:dennisroberts71/prelude

Conflicts:
	.gitignore