Fix bugs in my machine.
Fixed conflit with .log, added to .ignore, possible conflits on the other side.