emails
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	Gemfile.lock