renamed subtle.rb for tower
Merge branch 'master' of https://github.com/soapsurfer/dotfiles

Conflicts:
	subtle.rb
	subtle_laptop.rb
	subtle_seife.rb