Fixed git's removing of files
Merge remote-tracking branch 'origin'