git init macbook
mergeando