Trying to get hair curving to work
Merge branch 'master' of github.com:michaeltingley/CS175

Conflicts:
	Assignment8/headers/bunny.h