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

Conflicts:
	app/controllers/customers_controller.rb
	app/views/customers/index.html.erb