commit before pull
added activity for hairdresser, added push notification
merge finished maybe
merged eden and michals work