Erased a stupid line of text
Merge remote-tracking branch 'origin'