stupid error that deleted everything
Merge remote-tracking branch 'upstream/master'

Updates from Zack