font update
Merge branch 'master' of https://github.com/sudorails/e_verification
git update
Conflicts:
	config/database.yml