mac git initial
mac vim and ubuntu merge finish