Hair Braiding and Braids with Extensions