email
Merge branch 'master' of https://github.com/anxsaiyuki/r-web

Conflicts:
	config/environments/development.rb