emailing w/ Mailjet
Merge branch 'master' of https://github.com/payforme/payforme

Conflicts:
	Gemfile
	config/application.rb