Uploaded mars with blue people from "Lab" computer
Adding resolved conflict changes to github