mac working
what is git
weird merging
Adding images