update registration
solve conflict and update registration
Merge branch 'master' of https://github.com/Marzy-ya/SkinCare