deleted unnecessary file, changed name of other
Merge remote-tracking branch 'origin/master'