coding change my info
add setting my info
merged master