Removed extrafile.txt

Used for merge conflict example, don't need it anymore.