changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home/_setup_mail_form.html.erb
changes for modal
deleted tmp gemfile
Merge remote-tracking branch 'rt/master'