backup
Merge branch 'master' of https://github.com/sudorails/e_verification
new changes
Merge branch 'master' of https://github.com/sudorails/e_verification

Conflicts:
	config/database.yml
changes