Fix email
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
remove gemfile.lock
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'