fixed some git weirdness
Merge remote-tracking branch 'origin/master'
had to fix some git weirdness