merge??? i forget what i did
Merge branch 'master' of https://github.com/lilisun/hair
force control muahahah