everything so far
merging changes from master
done it
Merge pull request #5 from Julietbc/hairtype

Hairtype