Chris b

Fixing git weirdness