added first email notification for questions
Merge branch 'master' into emailer
resolving merge conflicts
Conflicts:
	app/models/answer.rb