取款

修改了取款函数，测试了存取款
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/test.php