wip
Merge branch 'master' of github.com:richrines/snail-mail

Conflicts:
	app/models/letter.rb
Merge branch 'master' of github.com:richrines/snail-mail