added kittens to laptop_specifc branch dfas line 8
used git mergetool -t kdiff3 and chose (d) for dfas. fixed merge error