Eh.
Merge branch 'master' of github.com:cceckman/Tilde

Conflicts:
	.bashrc