Removed some files added by accident
Merge remote-tracking branch 'upstream/master'