updates
 Please enter the commit message for your changes. Lines starting
updates
Merge branch 'master' of https://github.com/sudorails/e_verification

Conflicts:
	config/database.yml
	db/schema.rb