Merge branch 'master' of git@github.com:fs/rails-project-teaser

* 'master' of git@github.com:fs/rails-project-teaser:
  changes in Confirmer < ActionMailer::Base. for sending a mail
  some changes with email sending
  some changes with email sending
  rewrite subscriber model with attr_protected macro
  .gitignore changes + /log/* removed from repository

Conflicts:

	.gitignore
	db/development.sqlite3

.gitignore

@@ -2,4 +2,4 @@ log
 tmp/*
 db/*.sqlite3
 db/schema.rb
-*.swp
+*.swp