merge conflicts
modify the ico
Merge branch 'master' of https://github.com/sunshinezxf/HCI-HealthClub-Attendant