trying out git across 2 machines, merging etc