yaddax3
Merge branch 'master' of github.com:armchairdj/dotfiles

Conflicts:
	bash/tm_properties.symlink