add log
add reg
Merge branch 'master' of github.com:cathyJenny/Milestone2_JM_LY