renamed and corrected file type
Merge remote-tracking branch 'origin/master'