Added ignore for merge files.
Renamed kod to src.