Deleted that file a.txt
Made that a txt. :P
Merge remote-tracking branch 'origin/master'