backed up
merged remote master with mac master
updated